cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/0.10' into 0.10	Maximilian Hils	2013-12-08	5	-29/+34
\|\
\| *	Merge pull request #161 from mitmproxy/external_webapp	Aldo Cortesi	2013-12-08	5	-29/+34
\| \|\
\| \| *	add option to expose webapp externally, remove distinct ip setting	Maximilian Hils	2013-08-18	5	-29/+34
* \| \|	Merge branch 'master' into 0.10	Maximilian Hils	2013-12-08	1	-4/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Merge remote-tracking branch 'origin/master'	Maximilian Hils	2013-12-08	1	-4/+3
\| \|\ \
\| \| * \	Merge pull request #173 from joebowbeer/patch-1	Maximilian Hils	2013-10-22	1	-4/+3
\| \| \|\ \
\| \| \| * \|	Update android.html	joebowbeer	2013-10-18	1	-4/+3
\| \| \|/ /
* \| \| /	Merge branch 'master' into 0.10	Maximilian Hils	2013-09-14	12	-42/+103
\|\\| \| \| \| \|_\|/ \|/\| \|
\| * \|	add status images to README, include TestHTTPS again	Maximilian Hils	2013-08-25	2	-1/+3
\| * \|	exclude TestHTTPS for testing travis/coverage	Maximilian Hils	2013-08-25	1	-1/+1
\| * \|	fix travis, loose requirements.txt	Maximilian Hils	2013-08-25	2	-15/+16
\| * \|	re-add requirements.txt	Maximilian Hils	2013-08-25	1	-0/+15
\| * \|	add coveralls.io	Maximilian Hils	2013-08-25	1	-1/+5
\| \|/
\| *	Version bump.	Aldo Cortesi	2013-08-25	1	-1/+1
\| *	Prep for release: CHANGELOG and CONTRIBUTORS	Aldo Cortesi	2013-08-25	4	-36/+53
\| *	Merge pull request #162 from mhils/add_travis_ci	Aldo Cortesi	2013-08-22	2	-0/+11
\| \|\
\| \| *	add jsbeautifier to requirements.txt	Maximilian Hils	2013-08-20	1	-0/+1
\| \| *	travis ci: fix pip install order	Maximilian Hils	2013-08-20	1	-1/+1
\| \| *	travis ci: make sure that netlib is installed from head	Maximilian Hils	2013-08-20	1	-1/+4
\| \| *	add travis ci	Maximilian Hils	2013-08-20	1	-0/+7
\| * \|	Fix pretty_size unit tests.	Aldo Cortesi	2013-08-23	1	-1/+1
\| * \|	Tweak timing display	Aldo Cortesi	2013-08-23	4	-10/+10
\| * \|	Merge pull request #159 from kmanna/elapsed_time	Aldo Cortesi	2013-08-22	3	-2/+13
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	console: Add support for displaying transfer rate	Kyle Manna	2013-08-13	1	-0/+3
\| \| *	console: Add support for displaying elapsed time	Kyle Manna	2013-08-13	2	-1/+9
\| \| *	utils: Add missing "B" for pretty_size()	Kyle Manna	2013-08-13	1	-1/+1
* \| \|	Merge branch 'master' into 0.10	Maximilian Hils	2013-08-17	53	-456/+561
\|\\| \|
\| * \|	Merge remote-tracking branch 'origin/master'	Maximilian Hils	2013-08-17	2	-22/+5
\| \|\\|
\| \| *	Revamp dummy cert store	Aldo Cortesi	2013-08-12	2	-21/+4
\| \| *	Better handling of cert errors on connection.	Aldo Cortesi	2013-08-10	1	-1/+1
\| * \|	update gitignore to not include PyCharms	Maximilian Hils	2013-08-17	1	-0/+1
\| \|/
\| *	Remove GPL notices left in source files after our change to the MIT license.	Aldo Cortesi	2013-08-01	19	-287/+2
\| *	Make use of a change to netlib.tcp that clarifies error conditions for flush ...	Aldo Cortesi	2013-07-30	2	-6/+3
\| *	Show an error when attempting to decode invalid data.	Aldo Cortesi	2013-07-29	2	-3/+10
\| *	Repair minor user interface issue that caused brief flashes of duplicate flow...	Aldo Cortesi	2013-07-29	1	-0/+2
\| *	fix #144	Maximilian Hils	2013-07-28	1	-1/+1
\| *	Fix startup with no state.	Aldo Cortesi	2013-07-28	1	-1/+4
\| *	Terminate can be called on an unconnected server connection.	Aldo Cortesi	2013-07-28	1	-8/+9
\| *	Some refactoring of the console inteface.	Aldo Cortesi	2013-07-28	5	-34/+30
\| *	Properly terminate SSL server connections.	Aldo Cortesi	2013-07-28	1	-1/+3
\| *	Move app instantiation out of proxy.py.	Aldo Cortesi	2013-07-24	8	-24/+57
\| *	Make a start on mitmproxy web app.	Aldo Cortesi	2013-07-23	11	-2/+198
\| *	Don't take minor version into account when checking serialized data compatibl...	Aldo Cortesi	2013-07-13	2	-2/+3
\| *	Merge pull request #143 from liyanage/upstream-pull-request-2013-07-07	Aldo Cortesi	2013-07-11	1	-16/+70
\| \|\
\| \| *	Pass extra command line arguments to mitmproxy	Marc Liyanage	2013-07-08	1	-5/+13
\| \| *	Re-run mitmproxywrapper.py with sudo if necessary.	Marc Liyanage	2013-06-02	1	-0/+9
\| \| *	Change the proxy settings for all connected interfaces, not just the primary ...	Marc Liyanage	2013-05-15	1	-12/+49
\| * \|	Merge pull request #137 from caujka/master	Aldo Cortesi	2013-07-01	1	-1/+1
\| \|\ \
\| \| * \|	Added handling for EOF reading error in gzipped content.	Oleksandr Sheremet	2013-06-17	1	-1/+1
\| * \| \|	Merge pull request #139 from smurfix/fixes	Aldo Cortesi	2013-07-01	1	-1/+4
\| \|\ \ \ \| \| \|/ / \| \|/\| \|