aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1617 from cortesi/objectAldo Cortesi2016-10-17167-391/+261
|\
| * python3: clean up super and __future__Aldo Cortesi2016-10-17140-267/+136
| * python3: clean up class bracketsAldo Cortesi2016-10-1769-122/+122
| * Zap object base classAldo Cortesi2016-10-1765-114/+115
|/
* actually fix merge :see_no_evil:Maximilian Hils2016-10-162-16/+15
* fix mergeMaximilian Hils2016-10-161-7/+1
* Merge branch 'such-types'Maximilian Hils2016-10-1627-230/+202
|\
| * py2--: inline type infoMaximilian Hils2016-10-1627-239/+206
* | Merge pull request #1615 from cortesi/python3aAldo Cortesi2016-10-1760-336/+208
|\ \ | |/ |/|
| * test & examples: zap sixAldo Cortesi2016-10-1730-133/+107
| * mitmproxy: zap sixAldo Cortesi2016-10-1724-191/+97
| * pathod: remove sixAldo Cortesi2016-10-177-19/+11
* | update pydivert dependency (#1614)Maximilian Hils2016-10-161-1/+1
* | Merge pull request #1613 from cortesi/python3Aldo Cortesi2016-10-1731-203/+90
|\|
| * First-order conversion to Python3-onlyAldo Cortesi2016-10-1731-203/+90
|/
* Add stub converter for 0.19 io formatAldo Cortesi2016-10-171-0/+6
* Bump version post releaseAldo Cortesi2016-10-171-1/+1
* Bump to 0.18.1 to fix pypi obstreperousnessAldo Cortesi2016-10-163-106/+67
* Merge pull request #1602 from cortesi/scriptdocsAldo Cortesi2016-10-1630-466/+624
|\
| * docs: concurrency, developing scriptsAldo Cortesi2016-10-163-32/+20
| * scripts: keep scripts just after the ScriptLoader in addon chainAldo Cortesi2016-10-164-16/+43
| * docs: scripts on saved flowsAldo Cortesi2016-10-161-7/+23
| * mitmdump: fix addon order - dumper must be lastAldo Cortesi2016-10-161-1/+1
| * docs: link to correct tagMaximilian Hils2016-10-161-5/+16
| * docs: logging and the contextAldo Cortesi2016-10-166-27/+68
| * scripts: handle SystemExit from scripts explicitlyAldo Cortesi2016-10-161-0/+2
| * mitmdump: show script errors on startupAldo Cortesi2016-10-161-1/+1
| * docs: overview, classes, argumentsAldo Cortesi2016-10-167-47/+86
| * docs: improve external source links, tweak code docsAldo Cortesi2016-10-163-38/+53
| * Clean up models.http a bitAldo Cortesi2016-10-161-31/+17
| * docs: cleanups improvements and fighting sphinxAldo Cortesi2016-10-1618-356/+389
|/
* fix #1611Maximilian Hils2016-10-151-4/+2
* update CHANGELOGMaximilian Hils2016-10-151-0/+48
* Merge pull request #1610 from mhils/issue-1605Maximilian Hils2016-10-142-12/+19
|\
| * add regression test for #1605Maximilian Hils2016-10-141-0/+13
| * fix #1605Maximilian Hils2016-10-131-12/+6
|/
* Issue 1461 (#1609)Sanchit Sokhey2016-10-131-3/+14
* Merge pull request #1603 from mhils/eofMaximilian Hils2016-10-052-16/+5
|\
| * simplify eof detectionMaximilian Hils2016-10-052-16/+5
|/
* Merge pull request #1601 from cortesi/certcapAldo Cortesi2016-10-053-1/+37
|\
| * certutils: cap the cert store size at 100 by defaultAldo Cortesi2016-10-052-0/+36
| * debug: use correct fp for memory object outputAldo Cortesi2016-10-051-1/+1
|/
* Merge pull request #1598 from cortesi/dummystateThomas Kriechbaumer2016-10-043-10/+13
|\
| * mitmdump: use a dummy state objectAldo Cortesi2016-10-043-10/+13
* | use flt instead of filt for flowfilter expressionsThomas Kriechbaumer2016-10-044-11/+11
* | Merge pull request #1597 from cortesi/debugAldo Cortesi2016-10-042-4/+23
|\|
| * debug: Hard exit after debug signalAldo Cortesi2016-10-042-4/+9
| * debug: add a dump of objects in memoryAldo Cortesi2016-10-041-0/+14
* | Merge pull request #1596 from cortesi/addonsAldo Cortesi2016-10-0412-46/+81
|\|
| * Consolidate loggingAldo Cortesi2016-10-0412-46/+81
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 04:08:29 +0000