8 Commits

Author	SHA1	Message	Date
Jim Shaver	b51363b3ca	Merge remote-tracking branch 'upstream/master' into print-bracket-fix ... Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py	2015-05-31 01:21:44 -04:00
Jim Shaver	4fe2c069cc	Fixed print function to be inline with python 3	2015-05-29 23:17:48 -04:00
Aldo Cortesi	a05a70d816	Add coding style check, reformat.	2015-05-30 12:03:28 +12:00
Jean Regisser	17e0f7d159	Fixed palette forced to light in mitmproxywrapper.py	2014-03-26 13:15:23 +01:00
Marc Liyanage	e5c0891e84	Pass extra command line arguments to mitmproxy	2013-07-08 20:56:05 -07:00
Marc Liyanage	09c95ece52	Re-run mitmproxywrapper.py with sudo if necessary.	2013-06-02 12:43:49 -07:00
Marc Liyanage	ceafd411f3	Change the proxy settings for all connected interfaces, not just the primary one.	2013-05-15 22:40:08 -07:00
Marc Liyanage	50ac988363	Add mitmproxywrapper.py	2013-05-15 15:24:34 -07:00