aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | improve version specifiersThomas Kriechbaumer2017-01-232-1/+19
* | | Merge pull request #1945 from Kriechi/ca-expiredMaximilian Hils2017-01-2311-42/+133
|\ \ \
| * | | fix #939Thomas Kriechbaumer2017-01-2311-42/+133
| |/ /
* | | Merge pull request #1949 from s4chin/add-src-dst-filtersMaximilian Hils2017-01-232-467/+562
|\ \ \
| * | | Merge NullaryExpr, UnaryExpr and BooleanLiteralSachin Kelkar2017-01-232-421/+392
| * | | web: Add ~src and ~dst filtersSachin Kelkar2017-01-212-132/+256
| | |/ | |/|
* | | Merge pull request #1955 from Kriechi/test++Maximilian Hils2017-01-233-1/+92
|\ \ \
| * | | test disable_h2c_upgrade addonThomas Kriechbaumer2017-01-233-0/+19
| * | | test websocket addonThomas Kriechbaumer2017-01-232-1/+73
| | |/ | |/|
* | | Merge branch 'offby1-patch-1'Thomas Kriechbaumer2017-01-231-2/+3
|\ \ \ | |/ / |/| |
| * | fix link to macOS and Linux binariesEric Hanchrow2017-01-231-2/+3
| |/
* | Merge pull request #1950 from Kriechi/nuke-mockMaximilian Hils2017-01-2322-28/+30
|\ \ | |/ |/|
| * nuke mock dependencyThomas Kriechbaumer2017-01-2222-28/+30
|/
* replace iOS install instructions for CAsThomas Kriechbaumer2017-01-201-1/+3
* Merge pull request #1947 from s4chin/add-http-tcp-filterMaximilian Hils2017-01-202-181/+235
|\
| * web: Add ~http and ~tcp filtersSachin Kelkar2017-01-202-181/+235
|/
* Merge pull request #1940 from s4chin/add-marked-filterMaximilian Hils2017-01-204-171/+199
|\
| * web: Add ~marked filterSachin Kelkar2017-01-204-171/+199
* | 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