aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* improve dependency management in setup.pyMaximilian Hils2015-07-041-19/+24
* fix #648Maximilian Hils2015-07-041-2/+2
* clarify docsMaximilian Hils2015-07-041-2/+3
* fix #653Maximilian Hils2015-07-041-10/+15
* fix #593, fix #656, coverage++Maximilian Hils2015-07-033-53/+83
* fix windows compatibilityMaximilian Hils2015-07-032-2/+28
* Merge pull request #661 from kyle-m/masterAldo Cortesi2015-06-309-1/+205
|\
| * Enabling upstream server verification. Added flags --verify_upstream_cert,Kyle Morton2015-06-299-1/+205
|/
* synchronize metadata files across projectsMaximilian Hils2015-06-261-1/+4
* Merge branch 'appveyor2'Maximilian Hils2015-06-261-0/+11
|\
| * add appveyorMaximilian Hils2015-06-261-0/+11
* | Merge pull request #654 from mitmproxy/remove_certforwardAldo Cortesi2015-06-274-41/+19
|\|
| * remove certforward featureMaximilian Hils2015-06-264-41/+19
* | docs: fix certinstall image max-widthMaximilian Hils2015-06-261-1/+1
|/
* Remove stray print & massage whitespace a bitAldo Cortesi2015-06-251-9/+6
* Merge pull request #645 from elitest/hardfailvenvAldo Cortesi2015-06-242-2/+2
|\
| * Merge branch 'master' into hardfailvenvJim Shaver2015-06-23206-15109/+74656
| |\ | |/ |/|
* | Merge pull request #640 from Kriechi/ssl-version-handlingAldo Cortesi2015-06-231-43/+25
|\ \
| * | unify SSL version/method handlingThomas Kriechbaumer2015-06-231-43/+25
|/ /
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-06-238-5/+199
|\ \
| * \ Merge pull request #638 from iroiro123/http-transparentAldo Cortesi2015-06-238-5/+199
| |\ \
| | * | changed error handling (ssl spoof mode)iroiro1232015-06-233-16/+12
| | * | add unit tests for spoof modeiroiro1232015-06-233-0/+103
| | * | SSL Spoof modeiroiro1232015-06-215-8/+65
| | * | Spoof modeiroiro1232015-06-204-14/+21
| | * | HTTP Transparent Proxyiroiro1232015-06-184-2/+33
* | | | Travis to SlackAldo Cortesi2015-06-231-0/+5
|/ / /
* / / Update README.mkdMaximilian Hils2015-06-181-1/+0
|/ /
* | add landscape/prospector configThomas Kriechbaumer2015-06-183-21/+15
* | Update README.mkdMaximilian Hils2015-06-161-4/+6
* | fix pep8 configThomas Kriechbaumer2015-06-151-1/+0
* | Handle invalid IDNA encoding in hostnamesAldo Cortesi2015-06-122-6/+12
* | Fix typo in docs - thanks to Jim_Showalter@intuit.comAldo Cortesi2015-06-121-2/+2
* | Merge pull request #624 from drahosj/masterAldo Cortesi2015-06-124-5/+63
|\ \
| * | Added unmark all functionalityJake Drahos2015-06-111-0/+5
| * | Moved marking from flow to consoleJake Drahos2015-06-115-26/+29
| * | Merge remote-tracking branch 'origin/master'Jake Drahos2015-06-110-0/+0
| |\ \
| | * | Added functionality to write marked flows to fileJake Drahos2015-06-112-0/+13
| * | | Changed mark symbolJake Drahos2015-06-111-2/+2
| * | | Added functionality to write marked flows to fileJake Drahos2015-06-112-0/+13
| |/ /
| * | Unmark duplicated flowsJake Drahos2015-06-111-1/+3
| * | Changed symbols and colorsJake Drahos2015-06-112-2/+5
| * | Fixed console rendering bugJake Drahos2015-06-111-2/+5
| * | Marked flows not deleted on clear allJake Drahos2015-06-112-4/+11
| * | Implemented basic marking of flowsJake Drahos2015-06-113-0/+22
|/ /
* | fix #615Maximilian Hils2015-06-082-0/+6
* | fix #618Maximilian Hils2015-06-081-1/+1
* | import travis config from netlibThomas Kriechbaumer2015-06-081-8/+49
* | Merge pull request #613 from dweinstein/patch/docker-tweaksDavid Weinstein2015-06-072-27/+1
|\ \
| * | match name of automated build base imgDavid Weinstein2015-06-072-27/+1
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-13 05:00:57 +0000