aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix travisMaximilian Hils2016-10-271-0/+2
* fix #1678Maximilian Hils2016-10-271-3/+4
* Merge pull request #1680 from mhils/remove-lrucacheMaximilian Hils2016-10-271-32/+0
|\
| * remove mitmproxy.utils.lrucacheMaximilian Hils2016-10-271-32/+0
* | fix pyinstaller buildsMaximilian Hils2016-10-273-3/+3
* | Merge pull request #1670 from chhsiao90/display-cipher-#582Maximilian Hils2016-10-274-1/+19
|\ \ | |/ |/|
| * Show tls version on consolechhsiao902016-10-264-0/+9
| * Resolved #582: display ClientConnection select cipher of TLSchhsiao902016-10-264-1/+10
* | Merge pull request #1677 from cortesi/mypyAldo Cortesi2016-10-272-4/+5
|\ \
| * | Add mypy to lintAldo Cortesi2016-10-272-4/+5
|/ /
* | Merge pull request #1673 from mhils/issue-1620Aldo Cortesi2016-10-274-9/+14
|\ \
| * | fix the linter, knuth ftw!Maximilian Hils2016-10-251-1/+1
| * | fix #1620Maximilian Hils2016-10-253-8/+13
* | | fix pyinstaller buildsMaximilian Hils2016-10-262-2/+2
* | | Update and rename README.mkd to README.mdMaximilian Hils2016-10-252-20/+8
* | | minor fixesMaximilian Hils2016-10-252-4/+4
|/ /
* | Merge pull request #1669 from mhils/typecheck-optionsMaximilian Hils2016-10-2516-20/+138
|\ \ | |/ |/|
| * typecheck options, fix current inconsistenciesMaximilian Hils2016-10-2516-21/+135
| * make options keyword-onlyMaximilian Hils2016-10-254-0/+4
|/
* Merge pull request #1664 from chhsiao90/sni-display-#1639Maximilian Hils2016-10-244-1/+10
|\
| * Resolved #1639: display sni on ClientConnectionchhsiao902016-10-254-1/+10
* | Merge pull request #1656 from mhils/improve-export-2Maximilian Hils2016-10-247-162/+87
|\ \
| * | improve flow exportMaximilian Hils2016-10-227-162/+87
* | | Merge pull request #1661 from slobo/patch-1Maximilian Hils2016-10-241-1/+1
|\ \ \ | |_|/ |/| |
| * | Include `boudary=...` in mutipart postData Slobodan Mišković2016-10-241-1/+1
* | | fix FlowView._get_content_viewMaximilian Hils2016-10-241-2/+6
* | | replace mitmproxy.utils.lrucache with functools.lru_cacheSahil Chelaramani2016-10-243-49/+6
* | | disable erroneous linting errorsMaximilian Hils2016-10-241-8/+9
* | | add version check for Python 3.4-Maximilian Hils2016-10-241-0/+6
|/ /
* | Merge pull request #1649 from cortesi/killMaximilian Hils2016-10-223-3/+1
|\ \ | |/ |/|
| * Don't call error for flow killAldo Cortesi2016-10-223-3/+1
* | Merge pull request #1655 from mhils/fix-encodingMaximilian Hils2016-10-225-16/+40
|\ \
| * | various encoding fixes, fix #1650Maximilian Hils2016-10-225-25/+41
| * | Handle `bytes` in request parametersSlobodan Mišković2016-10-221-2/+10
| |/
* | Merge pull request #1653 from mhils/issue-1651Maximilian Hils2016-10-222-5/+8
|\ \ | |/ |/|
| * add README.rst validation to CIMaximilian Hils2016-10-221-2/+6
| * fix README syntaxMaximilian Hils2016-10-221-3/+2
|/
* Merge pull request #1648 from cortesi/consoleAldo Cortesi2016-10-221-1/+1
|\
| * console: give statusbar messages a default timeoutAldo Cortesi2016-10-221-1/+1
* | Merge pull request #1647 from babldev/fix-flowfilter-exampleAldo Cortesi2016-10-221-1/+1
|\ \
| * | The first argument should be the filter, then the flow.Brady Law2016-10-211-1/+1
|/ /
* / Adjust issue templateAldo Cortesi2016-10-221-12/+10
|/
* Merge pull request #1644 from cortesi/multidictAldo Cortesi2016-10-214-112/+6
|\
| * multidict: remove to_dictAldo Cortesi2016-10-212-28/+0
| * multidict: ditch ImmutableMultiDictAldo Cortesi2016-10-214-84/+6
* | Merge pull request #1642 from cortesi/doxAldo Cortesi2016-10-211-3/+3
|\|
| * docs: fix broken versionAldo Cortesi2016-10-211-3/+3
|/
* dev.sh: pin to v3.5 for nowAldo Cortesi2016-10-211-2/+2
* console: correct log event handling iAldo Cortesi2016-10-211-3/+4
* Merge pull request #1637 from cortesi/tatanetlibAldo Cortesi2016-10-20211-893/+907
|\