aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* handle script hooks in replay, fix tests, fix #402Maximilian Hils2014-11-143-43/+55
* fix grideditor bugMaximilian Hils2014-11-141-0/+2
* docs++Maximilian Hils2014-11-131-0/+9
* fix testsMaximilian Hils2014-11-112-2/+3
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-11-114-19/+11
|\
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-11-117-24/+28
| |\
| * | Remove entry points in favor of vanilla scripts, fix test-releaseAldo Cortesi2014-11-112-17/+9
| * | Minor doc adjustmentsAldo Cortesi2014-11-072-2/+2
* | | be more explicit about requirementsMaximilian Hils2014-11-112-2/+6
| |/ |/|
* | fix clear keyMaximilian Hils2014-11-101-4/+5
* | Merge pull request #403 from Lucas-C/masterMaximilian Hils2014-11-101-6/+5
|\ \
| * | Using uppercase C to 'clear' display mode, because lowercase 'c' is used for cssLucas Cimon2014-11-071-6/+5
* | | fix #402Maximilian Hils2014-11-101-1/+2
* | | update change_upstream_proxy exampleMaximilian Hils2014-11-101-2/+2
|/ /
* | fix testsMaximilian Hils2014-11-071-9/+13
* | fix #401Maximilian Hils2014-11-071-8/+4
* | fix #399Maximilian Hils2014-11-062-3/+6
|/
* Reduce loop timeouts to improve mitmproxy responsivenessAldo Cortesi2014-11-062-4/+11
* Fix bug in flow dumping, add unit test that should have caught this in the fi...Aldo Cortesi2014-11-062-2/+16
* We don't need requests for mitmproxyAldo Cortesi2014-11-052-4/+1
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-11-043-11/+33
|\
| * Merge pull request #393 from onlywade/masterMaximilian Hils2014-11-012-9/+31
| |\
| | * Updating OPTIONS test with related issue number.Wade 5242014-10-311-1/+1
| | * Fixing issue #392.Wade 5242014-10-311-3/+2
| | * Adding some test coverage for handling HTTP OPTIONS requests.Wade 5242014-10-311-6/+29
| |/
| * fix #391Maximilian Hils2014-10-301-2/+2
* | Release prep: binaries build script, release checklist, fuzzingAldo Cortesi2014-11-026-6/+27
|/
* LegibilityAldo Cortesi2014-10-263-50/+128
* Fix crash while streamingAldo Cortesi2014-10-264-26/+53
* Spacing and legibilityAldo Cortesi2014-10-262-27/+72
* Start a fuzzing architecture for mitmproxyAldo Cortesi2014-10-269-9/+61
* Merge pull request #387 from onlywade/masterMaximilian Hils2014-10-251-2/+3
|\
| * Fixing issue #368.Wade 5242014-10-241-2/+3
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-10-2312-225/+361
|\
| * Document http2https and https2httpAldo Cortesi2014-10-232-1/+30
| * Correct docs - we no longer support change of basic proxy mode in the console...Aldo Cortesi2014-10-232-6/+0
| * More refactoring of installation docsAldo Cortesi2014-10-232-20/+45
| * Keep sidebar ordering alphabetical, add SOCKS documentationAldo Cortesi2014-10-234-5/+17
| * CHANGELOG and CONTRIBUTORSAldo Cortesi2014-10-232-27/+84
| * First redraft of modes documentationAldo Cortesi2014-10-231-143/+155
| * Documentation re-orgAldo Cortesi2014-10-234-34/+41
* | fix typoMaximilian Hils2014-10-231-1/+1
* | update proxy modes diagramsMaximilian Hils2014-10-234-0/+0
|/
* fix #346Maximilian Hils2014-10-222-1/+16
|\
| * reverse proxy: adjust dst when reading flows, fix #346Maximilian Hils2014-09-082-2/+16
* | fix #378Maximilian Hils2014-10-221-3/+19
* | tweak SSL detection heuristicsMaximilian Hils2014-10-212-2/+17
* | fix race conditions in testsMaximilian Hils2014-10-193-0/+17
* | add generic tcp proxying, fix #374Maximilian Hils2014-10-1818-88/+250
* | remove default_caMaximilian Hils2014-10-184-8/+4