17 Commits

Author	SHA1	Message	Date
Vinay Dargar	55ba6ed14d	Replace phrase 'the the' in 2 places ... Replaced with the appropriate "in the" and "to the". There are multiple other occurences of this but they are in upstream python modules.	2017-04-02 21:37:38 +05:30
Maximilian Hils	375680a3be	add connection ids	2017-03-14 17:08:40 +01:00
Maximilian Hils	517aef1557	decouple mitmproxy and file format version	2017-03-13 16:46:07 +01:00
Maximilian Hils	88d48e38af	Revert "clearly indentify git-checkout as dev version" ... This temporarily reverts commit 3b4d8d6eca, which broke the snapshot builds.	2017-03-07 14:49:52 +01:00
Thomas Kriechbaumer	3b4d8d6eca	clearly indentify git-checkout as dev version	2017-03-06 18:40:43 +01:00
Thomas Kriechbaumer	0b1cdc382c	bump dev version	2017-02-21 19:17:33 +01:00
Maximilian Hils	e531a97a8b	bump version for next release cycle	2016-12-27 20:52:22 +01:00
Maximilian Hils	6ae378aa20	bump version to 1.0.1	2016-12-27 19:26:28 +01:00
Aldo Cortesi	aa90fd359d	Administrivia: docs for new config file, minor adjustments ... For now, the config file docs basically say "it's YAML, read the source". We should do better for the next release.	2016-12-17 10:57:13 +13:00
Aldo Cortesi	2fe7cf448d	Release administrivia: changelog stub, contributors, bump to v1.0	2016-12-17 10:35:13 +13:00
Maximilian Hils	3154dc87fd	fix pyinstaller ... amongst other things, fix #1746	2016-11-28 00:51:52 +01:00
Aldo Cortesi	7440232f60	netlib.version -> mitmproxy.version	2016-10-20 09:20:44 +13:00
Aldo Cortesi	728d5caa22	Fold mitmproxy.version and pathod.version into netlib.version	2016-06-12 10:29:12 +12:00
Maximilian Hils	0a2e7a97cd	use module-level imports only	2016-05-31 19:06:57 -07:00
Thomas Kriechbaumer	e2447406cc	more style cleanup	2016-05-29 13:43:20 +02:00
Maximilian Hils	acab4fea5a	fix version.NAME	2016-05-11 13:02:19 -06:00
Maximilian Hils	d33d3663ec	combine projects	2016-02-18 13:03:40 +01:00