Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1963 from cortesi/cover | Aldo Cortesi | 2017-01-29 | 5 | -20/+73 | |
|\| | | ||||||
| * | | addons: unit tests to 100% | Aldo Cortesi | 2017-01-29 | 5 | -20/+73 | |
|/ / | ||||||
* | | fix newlines on windows | Thomas Kriechbaumer | 2017-01-25 | 1 | -5/+5 | |
* | | fix alpn requirement in web tests | Thomas Kriechbaumer | 2017-01-25 | 1 | -1/+1 | |
* | | simplify termlog outfile handling | Thomas Kriechbaumer | 2017-01-25 | 2 | -22/+28 | |
* | | write errors to stderr (#1952) | nish21 | 2017-01-25 | 2 | -7/+17 | |
* | | Merge pull request #1957 from s4chin/add-body-filters | Maximilian Hils | 2017-01-24 | 2 | -276/+453 | |
|\ \ | ||||||
| * | | web: Add body filters | Sachin Kelkar | 2017-01-24 | 2 | -276/+453 | |
|/ / | ||||||
* | | Merge pull request #1956 from Kriechi/version-string | Thomas Kriechbaumer | 2017-01-23 | 2 | -1/+19 | |
|\ \ | ||||||
| * | | improve version specifiers | Thomas Kriechbaumer | 2017-01-23 | 2 | -1/+19 | |
* | | | Merge pull request #1945 from Kriechi/ca-expired | Maximilian Hils | 2017-01-23 | 11 | -42/+133 | |
|\ \ \ | ||||||
| * | | | fix #939 | Thomas Kriechbaumer | 2017-01-23 | 11 | -42/+133 | |
| |/ / | ||||||
* | | | Merge pull request #1949 from s4chin/add-src-dst-filters | Maximilian Hils | 2017-01-23 | 2 | -467/+562 | |
|\ \ \ | ||||||
| * | | | Merge NullaryExpr, UnaryExpr and BooleanLiteral | Sachin Kelkar | 2017-01-23 | 2 | -421/+392 | |
| * | | | web: Add ~src and ~dst filters | Sachin Kelkar | 2017-01-21 | 2 | -132/+256 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1955 from Kriechi/test++ | Maximilian Hils | 2017-01-23 | 3 | -1/+92 | |
|\ \ \ | ||||||
| * | | | test disable_h2c_upgrade addon | Thomas Kriechbaumer | 2017-01-23 | 3 | -0/+19 | |
| * | | | test websocket addon | Thomas Kriechbaumer | 2017-01-23 | 2 | -1/+73 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'offby1-patch-1' | Thomas Kriechbaumer | 2017-01-23 | 1 | -2/+3 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix link to macOS and Linux binaries | Eric Hanchrow | 2017-01-23 | 1 | -2/+3 | |
| |/ | ||||||
* | | Merge pull request #1950 from Kriechi/nuke-mock | Maximilian Hils | 2017-01-23 | 22 | -28/+30 | |
|\ \ | |/ |/| | ||||||
| * | nuke mock dependency | Thomas Kriechbaumer | 2017-01-22 | 22 | -28/+30 | |
|/ | ||||||
* | replace iOS install instructions for CAs | Thomas Kriechbaumer | 2017-01-20 | 1 | -1/+3 | |
* | Merge pull request #1947 from s4chin/add-http-tcp-filter | Maximilian Hils | 2017-01-20 | 2 | -181/+235 | |
|\ | ||||||
| * | web: Add ~http and ~tcp filters | Sachin Kelkar | 2017-01-20 | 2 | -181/+235 | |
|/ | ||||||
* | Merge pull request #1940 from s4chin/add-marked-filter | Maximilian Hils | 2017-01-20 | 4 | -171/+199 | |
|\ | ||||||
| * | web: Add ~marked filter | Sachin Kelkar | 2017-01-20 | 4 | -171/+199 | |
* | | Merge pull request #1941 from Kriechi/sysinfo | Thomas Kriechbaumer | 2017-01-19 | 12 | -33/+42 | |
|\ \ | |/ |/| | ||||||
| * | provide git information with --version | Thomas Kriechbaumer | 2017-01-19 | 12 | -33/+42 | |
|/ | ||||||
* | Merge pull request #1932 from wufeifei/patch-2 | Maximilian Hils | 2017-01-16 | 1 | -2/+2 | |
|\ | ||||||
| * | update stream.py | Feei | 2017-01-16 | 1 | -2/+2 | |
|/ | ||||||
* | Merge pull request #1931 from wufeifei/patch-1 | Maximilian Hils | 2017-01-16 | 1 | -2/+2 | |
|\ | ||||||
| * | update log_events.py | Feei | 2017-01-16 | 1 | -2/+2 | |
|/ | ||||||
* | Merge pull request #1923 from mhils/display-http-version | Thomas Kriechbaumer | 2017-01-14 | 1 | -2/+7 | |
|\ | ||||||
| * | console: display http version in details | Maximilian Hils | 2017-01-10 | 1 | -2/+7 | |
* | | Merge pull request #1926 from tripleee/patch-1 | Maximilian Hils | 2017-01-13 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | reSt verbatim formatting error | tripleee | 2017-01-13 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #1918 from s4chin/update-hacking-instructions | Maximilian Hils | 2017-01-10 | 1 | -2/+3 | |
|\ \ | |/ |/| | ||||||
| * | Update instructions | Sachin Kelkar | 2017-01-06 | 1 | -2/+3 | |
* | | clarify windows install docs | Maximilian Hils | 2017-01-10 | 1 | -3/+3 | |
* | | Merge pull request #1922 from mhils/read-from-stdin | Maximilian Hils | 2017-01-10 | 1 | -2/+5 | |
|\ \ | ||||||
| * | | mitmdump: fix reading from stdin | Maximilian Hils | 2017-01-10 | 1 | -2/+5 | |
* | | | Merge pull request #1920 from rodsenra/master | Maximilian Hils | 2017-01-10 | 1 | -0/+13 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Added note about server-side replay for sessions recorded in reverse-proxy mode | Rodrigo Senra | 2017-01-07 | 1 | -0/+13 | |
|/ / | ||||||
* | | stronger tests, lint | Maximilian Hils | 2017-01-07 | 3 | -4/+3 | |
* | | fix #1910 | Maximilian Hils | 2017-01-07 | 1 | -1/+1 | |
* | | minor legibility improvements | Maximilian Hils | 2017-01-07 | 1 | -8/+17 | |
* | | Revert "add strutils.replace_surrogates" | Maximilian Hils | 2017-01-07 | 2 | -16/+0 | |
* | | add strutils.replace_surrogates | Maximilian Hils | 2017-01-07 | 2 | -0/+16 | |
* | | minor encoding fixes | Maximilian Hils | 2017-01-07 | 10 | -63/+68 |