aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* improve script loadingMaximilian Hils2016-05-119-54/+76
* actually fix testsMaximilian Hils2016-05-101-2/+2
* Revert "fix tests"Maximilian Hils2016-05-107-84/+53
* fix testsMaximilian Hils2016-05-107-53/+84
* Merge pull request #1086 from Kriechi/h2-improvThomas Kriechbaumer2016-05-101-22/+7
|\
| * cleanup h2 layerThomas Kriechbaumer2016-05-101-22/+7
|/
* fix #1120Maximilian Hils2016-05-093-1/+15
* fix mitmdump shutdownMaximilian Hils2016-05-081-1/+1
* mitmdump: make sure to always call done() in inline scriptsMaximilian Hils2016-05-081-0/+1
* actually fix #1115Maximilian Hils2016-05-061-1/+1
* issue-1115Maximilian Hils2016-05-061-2/+2
* scripts: allow package importsMaximilian Hils2016-05-031-0/+2
* disable py.test timeout by default, this breaks interactive debuggersMaximilian Hils2016-05-023-3/+3
* web: update dependenciesMaximilian Hils2016-05-024-7914/+8022
* Merge pull request #1107 from javabrett/dev-dot-shThomas Kriechbaumer2016-05-011-1/+1
|\
| * README.rst should refer to ./dev.sh not ./devBrett Randall2016-05-011-1/+1
|/
* docs: minor fixesMaximilian Hils2016-04-305-4/+7
* Merge pull request #1102 from mitmproxy/stateobject-listThomas Kriechbaumer2016-04-303-1/+80
|\
| * stateobject: support listsMaximilian Hils2016-04-293-1/+80
* | Include correct documentation URL in error messageSteven Noble2016-04-301-1/+1
|/
* fix bugs introduced in 317b4beMaximilian Hils2016-04-291-2/+5
* tcp protocol: stop on server shutdownMaximilian Hils2016-04-291-1/+1
* mitmdump: don't fail for other flowtypesMaximilian Hils2016-04-293-19/+27
* mitmdump: fix shutdown after reading flow fileMaximilian Hils2016-04-291-1/+0
* fix bug introduced in 909d5ecMaximilian Hils2016-04-291-1/+1
* remove netlib version checkMaximilian Hils2016-04-293-32/+2
* FlowReadError -> FlowReadExceptionMaximilian Hils2016-04-298-32/+31
* fix #1089Maximilian Hils2016-04-282-4/+5
* Update certinstall.rstMaximilian Hils2016-04-281-2/+2
* Generate better function names for root url. (#1100)Zohar Lorberbaum2016-04-281-1/+3
* support for setting/sending multiple cookies (#1091)Steven Van Acker2016-04-222-4/+24
* release: always build tagsMaximilian Hils2016-04-212-2/+2
* silence flaky pathod testMaximilian Hils2016-04-211-0/+1
* update reverse proxy documentation, fix #1092Maximilian Hils2016-04-211-1/+3
* dependency updateMaximilian Hils2016-04-211-2/+2
* downgrade pyparsing to fix #1087 and #1090Maximilian Hils2016-04-212-4/+10
* fix CONNECT display in upstream modeMaximilian Hils2016-04-202-2/+3
* mitmdump: allow stdin as infileMaximilian Hils2016-04-181-4/+20
* fix proxy authorization bug, refs #988Maximilian Hils2016-04-171-1/+1
* cleanup mitmproxy.controller, raise Kill in Channel (#1085)Maximilian Hils2016-04-1416-178/+265
* py3++Maximilian Hils2016-04-1311-33/+36
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-132-3/+3
|\
| * gulp-minify-css is deprecated. Adding gulp-clean-cssIsrael Blancas2016-04-112-3/+3
* | fix #1082Maximilian Hils2016-04-131-1/+1
* | minor improvementsMaximilian Hils2016-04-135-29/+13
|/
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-111-0/+11
|\
| * Add installation instructions for Arch Linux (#1079)Felix Yan2016-04-111-0/+11
* | peer_address -> ip_addressMaximilian Hils2016-04-119-23/+16
* | docs: better data structure docsMaximilian Hils2016-04-117-76/+66
|/
* docs: fix logoMaximilian Hils2016-04-102-0/+0