aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* asyncio: test cleanupAldo Cortesi2018-04-025-8/+27
* asyncio: shift console over to asyncio eventloopAldo Cortesi2018-04-022-9/+5
* asyncio: make http2 tests passAldo Cortesi2018-04-023-9/+16
* asyncio: fix a few remaining issues in proxy/test_server.pyAldo Cortesi2018-04-022-9/+14
* asyncio: fix channel interface and testsAldo Cortesi2018-04-014-24/+33
* asyncio: fix client replayAldo Cortesi2018-04-012-23/+3
* asyncio: start a test loop for unit testsAldo Cortesi2018-04-016-17/+9
* Remove support for Python 3.5Aldo Cortesi2018-04-011-2/+2
* asyncio: clean up event loop acquisitionAldo Cortesi2018-04-012-97/+20
* asyncio: brutally rip out our old queue mechanismAldo Cortesi2018-04-0110-140/+159
* Update dev.ps1Thomas Kriechbaumer2018-03-311-3/+3
* Merge pull request #3025 from Kriechi/py36Aldo Cortesi2018-04-0111-49/+21
|\
| * Python 3.5 is dead -- long live Python 3.6!Thomas Kriechbaumer2018-03-3111-49/+21
* | Merge pull request #3026 from ghillu/masterThomas Kriechbaumer2018-03-311-2/+2
|\ \ | |/ |/|
| * Update addons-overview.mdghillu2018-04-011-2/+2
|/
* Merge pull request #3012 from Kriechi/docs-optionsAldo Cortesi2018-03-3013-65/+126
|\
| * docs: add auto-generated options referenceThomas Kriechbaumer2018-03-2513-68/+115
| * docs: add skeleton for options scriptMaximilian Hils2018-03-241-0/+14
* | simplify READMEMaximilian Hils2018-03-281-2/+1
* | fix badgesThomas Kriechbaumer2018-03-271-4/+9
* | fix docs-related URLsThomas Kriechbaumer2018-03-271-3/+3
* | Merge pull request #3014 from MikeShi42/patch-1Thomas Kriechbaumer2018-03-271-1/+1
|\ \
| * | Fixed Typo in Transparent Proxy Setup for MacMichael Shi2018-03-261-1/+1
|/ /
* | Merge pull request #3010 from Kriechi/bump-tornadoThomas Kriechbaumer2018-03-242-1/+5
|\ \
| * | fix Tornado 5.0 event loopThomas Kriechbaumer2018-03-242-1/+5
|/ /
* | [requires.io] dependency update on master branch (#2992)Thomas Kriechbaumer2018-03-241-2/+2
* | Merge pull request #3008 from mhils/issue-2969Maximilian Hils2018-03-234-12/+18
|\ \ | |/ |/|
| * don't crash if server address is unknown, fix #2969Maximilian Hils2018-03-234-12/+18
|/
* fix cloudfront invalidation pathsMaximilian Hils2018-03-213-3/+3
* Merge pull request #3004 from mhils/docs-improvementsMaximilian Hils2018-03-2122-174/+250
|\
| * various docs improvementsMaximilian Hils2018-03-2115-96/+141
| * improve transparent mode docsMaximilian Hils2018-03-201-80/+75
| * minor docs fixesMaximilian Hils2018-03-203-36/+43
| * add google analyticsMaximilian Hils2018-03-202-0/+2
| * abort doc scripts on errorMaximilian Hils2018-03-205-1/+6
| * add README for docs installMaximilian Hils2018-03-201-0/+22
* | update mitmweb dev instructionsMaximilian Hils2018-03-202-6/+6
|/
* Merge pull request #2995 from cortesi/benchAldo Cortesi2018-03-196-0/+93
|\
| * bench: Add some very simple manual benchmarking helpersAldo Cortesi2018-03-176-0/+93
* | Merge pull request #2999 from fenilgandhi/Fix-2953Maximilian Hils2018-03-181-3/+1
|\ \
| * | minor improvementsMaximilian Hils2018-03-181-1/+1
| * | Remove Highlight from statusbarFenil Gandhi2018-03-191-3/+1
|/ /
* | Merge pull request #2997 from jplochocki/patch-1Maximilian Hils2018-03-181-1/+1
|\ \ | |/ |/|
| * Update cut.pyjplochocki2018-03-181-1/+1
|/
* Merge pull request #2991 from fenilgandhi/Fix-2990Maximilian Hils2018-03-151-4/+2
|\
| * Fixing the Fix for #2990Fenil Gandhi2018-03-151-0/+2
| * Removing the erroneously highlighted keybindingFenil Gandhi2018-03-151-4/+0
|/
* Merge pull request #2956 from kira0204/test-for-2850Maximilian Hils2018-03-152-3/+33
|\
| * adding commandkira02042018-03-121-3/+5
| * Testing using addonkira02042018-03-121-11/+17