aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1941 from Kriechi/sysinfoThomas Kriechbaumer2017-01-1912-33/+42
|\
| * provide git information with --versionThomas Kriechbaumer2017-01-1912-33/+42
|/
* Merge pull request #1932 from wufeifei/patch-2Maximilian Hils2017-01-161-2/+2
|\
| * update stream.pyFeei2017-01-161-2/+2
|/
* Merge pull request #1931 from wufeifei/patch-1Maximilian Hils2017-01-161-2/+2
|\
| * update log_events.pyFeei2017-01-161-2/+2
|/
* Merge pull request #1923 from mhils/display-http-versionThomas Kriechbaumer2017-01-141-2/+7
|\
| * console: display http version in detailsMaximilian Hils2017-01-101-2/+7
* | Merge pull request #1926 from tripleee/patch-1Maximilian Hils2017-01-131-2/+2
|\ \
| * | reSt verbatim formatting errortripleee2017-01-131-2/+2
|/ /
* | Merge pull request #1918 from s4chin/update-hacking-instructionsMaximilian Hils2017-01-101-2/+3
|\ \ | |/ |/|
| * Update instructionsSachin Kelkar2017-01-061-2/+3
* | clarify windows install docsMaximilian Hils2017-01-101-3/+3
* | Merge pull request #1922 from mhils/read-from-stdinMaximilian Hils2017-01-101-2/+5
|\ \
| * | mitmdump: fix reading from stdinMaximilian Hils2017-01-101-2/+5
* | | Merge pull request #1920 from rodsenra/masterMaximilian Hils2017-01-101-0/+13
|\ \ \ | |/ / |/| |
| * | Added note about server-side replay for sessions recorded in reverse-proxy modeRodrigo Senra2017-01-071-0/+13
|/ /
* | stronger tests, lintMaximilian Hils2017-01-073-4/+3
* | fix #1910Maximilian Hils2017-01-071-1/+1
* | minor legibility improvementsMaximilian Hils2017-01-071-8/+17
* | Revert "add strutils.replace_surrogates"Maximilian Hils2017-01-072-16/+0
* | add strutils.replace_surrogatesMaximilian Hils2017-01-072-0/+16
* | minor encoding fixesMaximilian Hils2017-01-0710-63/+68
* | fix HTTP reason phrase encodingMaximilian Hils2017-01-071-2/+4
* | update dependenciesMaximilian Hils2017-01-071-5/+4
|/
* Controls the length of URL displayed using the -d option (#1903)lymanZerga112017-01-052-0/+13
* Merge pull request #1904 from chhsiao90/edit-form-encodeMaximilian Hils2016-12-311-2/+2
|\
| * Fixed edit form failedchhsiao902016-12-311-2/+2
|/
* Merge pull request #1905 from chhsiao90/allow-underscore-hostnameMaximilian Hils2016-12-302-1/+4
|\
| * Allow underscore in hostnamechhsiao902016-12-302-1/+4
|/
* Merge pull request #1896 from mhils/3.5.0-compatMaximilian Hils2016-12-282-8/+32
|\
| * fix IO type checkingMaximilian Hils2016-12-282-0/+10
| * fix compat with Python 3.5.0Maximilian Hils2016-12-282-8/+22
|/
* update io compat for 2.0Maximilian Hils2016-12-271-0/+6
* Update README.mdMaximilian Hils2016-12-271-1/+1
* Update README.mdMaximilian Hils2016-12-271-0/+1
* bump version for next release cycleMaximilian Hils2016-12-271-1/+1
* Merge pull request #1887 from Kriechi/h2-enableThomas Kriechbaumer2016-12-272-5/+4
|\
| * enable HTTP/2 by defaultThomas Kriechbaumer2016-12-262-5/+4
* | add mitmweb to READMEMaximilian Hils2016-12-271-0/+2
* | bump version to 1.0.1Maximilian Hils2016-12-271-1/+1
* | turns out we need thisMaximilian Hils2016-12-271-0/+1
* | fix url.parse tests for Python 3.6Maximilian Hils2016-12-271-3/+10
* | py36: fix type informationThomas Kriechbaumer2016-12-271-7/+20
* | run tests on Python 3.6Thomas Kriechbaumer2016-12-275-3/+15
* | pyinstaller: use fixed bootloaders on linuxMaximilian Hils2016-12-271-1/+3
|/
* update windows dev scriptMaximilian Hils2016-12-261-1/+6
* add mitmweb explanation to introductionMaximilian Hils2016-12-261-0/+2
* Bump changelog timestampAldo Cortesi2016-12-261-1/+1
* Merge pull request #1865 from cortesi/adminAldo Cortesi2016-12-245-131/+102
|\