aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2851 from mhils/always-use-tls-settingsMaximilian Hils2018-02-105-27/+46
|\
| * use TLS options also for request replay, refs #2840Maximilian Hils2018-02-085-27/+46
* | Merge pull request #2855 from gokulchandra/patch-1Thomas Kriechbaumer2018-02-091-2/+1
|\ \
| * | Updates the pfctl configGokul2018-02-091-2/+1
|/ /
* | Merge pull request #2852 from kajojify/excess_returnMaximilian Hils2018-02-081-1/+1
|\ \
| * | Excess return was deletedMiroslav2018-02-081-1/+1
|/ /
* | Merge pull request #2842 from mitmproxy/web-timingsMaximilian Hils2018-02-071-1/+1
|\ \
| * | [web] fix timing display for keepalive connectionsMaximilian Hils2018-02-051-1/+1
* | | [requires.io] dependency update on master branch (#2848)Thomas Kriechbaumer2018-02-071-1/+1
|/ /
* | Merge pull request #2835 from MatthewShao/mitmweb-sortMaximilian Hils2018-02-053-3/+10
|\ \
| * | [web] Fix unstable sorting by using 'stable' dependencyMatthew Shao2018-02-053-3/+10
* | | Extend mypy checking, fix #2194 (#2819)Arushit Mudgal2018-02-036-56/+68
* | | don't raise when pyperclip doesn't find a clipboard, fix #2816Samoilenko Roman2018-02-034-4/+27
* | | add shortcuts for console.choose, fix #2785Samoilenko Roman2018-02-031-6/+25
|/ /
* | Merge pull request #2833 from mitmproxy/issue-2824Maximilian Hils2018-02-012-2/+16
|\|
| * remove quotes around filenameMaximilian Hils2018-02-012-1/+15
| * improve error message for missing scripts, fix #2824Maximilian Hils2018-02-011-1/+1
|/
* Merge pull request #2814 from kajojify/issue-2753Maximilian Hils2018-01-304-12/+21
|\
| * Fix #2753. Fix resetting editings.Miroslav2018-01-264-12/+21
* | Merge pull request #2825 from kajojify/realtime_counterMaximilian Hils2018-01-301-1/+2
|\ \
| * | Real-time flow counterMiroslav2018-01-301-1/+2
|/ /
* | Merge pull request #2820 from aniketpanjwani/masterMaximilian Hils2018-01-291-16/+16
|\ \
| * | Fix mistakes in examples/simple/Readme.md.Aniket Panjwani2018-01-291-16/+16
|/ /
* | Merge pull request #2817 from Kriechi/bump-bugfix-dependenciesMaximilian Hils2018-01-291-10/+10
|\ \
| * | bump minimum requirements for known bugfix releasesThomas Kriechbaumer2018-01-271-10/+10
|/ /
* | bump minimum required urwid version, fix #2815Maximilian Hils2018-01-261-1/+1
* | Fix for #2750 and #2783 (#2809)Samoilenko Roman2018-01-256-32/+77
* | fix #2800Arushit Mudgal2018-01-252-3/+20
|/
* Fix #2786 (#2798)Samoilenko Roman2018-01-181-1/+3
* fix #2752 (#2796)Samoilenko Roman2018-01-181-2/+7
* [requires.io] dependency update on master branch (#2799)Thomas Kriechbaumer2018-01-181-1/+1
* Merge pull request #2736 from mitmproxy/posix-commandsMaximilian Hils2018-01-181-1/+1
|\
| * parse commands in posix modeMaximilian Hils2017-12-311-1/+1
* | update stale URL in READMEMaximilian Hils2018-01-151-1/+1
* | Fix #2765 (#2792)Samoilenko Roman2018-01-142-1/+6
* | Fix #2768 (#2778)Samoilenko Roman2018-01-142-3/+12
* | Merge pull request #2793 from kajojify/issue-2399Maximilian Hils2018-01-142-1/+2
|\ \
| * | Other conditionMiroslav2018-01-141-2/+2
| * | Fix #2399Miroslav2018-01-142-1/+2
* | | Merge pull request #2791 from mhils/tls-extensionsMaximilian Hils2018-01-137-10/+28
|\ \ \
| * | | store ClientHello extensions with client connectionMaximilian Hils2018-01-137-10/+28
|/ / /
* | | Merge pull request #2790 from mhils/stateobject-improvementsMaximilian Hils2018-01-136-106/+190
|\ \ \
| * | | stateobject: use typing, enable tuples and more complex datatypesMaximilian Hils2018-01-136-106/+190
* | | | Merge pull request #2789 from mhils/move-clienthelloMaximilian Hils2018-01-136-155/+240
|\ \ \ \ | |/ / / |/| | |
| * | | improve net.tls.ClientHello API, fix bugs, add testsMaximilian Hils2018-01-134-19/+95
| * | | move ClientHello and related functions to mitmproxy.net.tlsMaximilian Hils2018-01-126-155/+164
|/ / /
* | | Merge pull request #2784 from ujjwal96/kaitaiMaximilian Hils2018-01-111-3/+5
|\ \ \
| * | | Update GIF parserUjjwal Verma2018-01-111-3/+5
* | | | Merge pull request #2780 from ujjwal96/console-fixMaximilian Hils2018-01-112-2/+2
|\ \ \ \
| * | | | Fix crash when searchingUjjwal Verma2018-01-112-2/+2