25071 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	a73d0fe9a8	Document key-pinning-journal ... Closes 22347	2017-06-16 14:26:50 -04:00
Nick Mathewson	80ad374b84	Remove old callgraph scripts; recommend calltool instead.	2017-06-14 17:44:15 -04:00
Nick Mathewson	3f40d9ec20	Merge branch 'maint-0.3.0'	2017-06-09 09:58:46 -04:00
Nick Mathewson	493d9cd17b	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-06-09 09:58:46 -04:00
Nick Mathewson	cd7d006e08	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-06-09 09:58:46 -04:00
Nick Mathewson	307be8d4a7	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-06-09 09:58:45 -04:00
Nick Mathewson	24ee8595bf	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-06-09 09:58:45 -04:00
Nick Mathewson	3913f959e3	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-06-09 09:58:45 -04:00
Nick Mathewson	325c507a09	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-06-09 09:58:45 -04:00
Karsten Loesing	104e8fa751	Update geoip and geoip6 to the June 8 2017 database.	2017-06-09 15:47:49 +02:00
Nick Mathewson	4f4d3de80c	Merge branch 'maint-0.3.0' ... "ours" merge to avoid version bump.	2017-06-08 14:06:49 -04:00
Nick Mathewson	ddfb877242	Merge branch 'maint-0.2.9' into maint-0.3.0 ... "ours" merge to avoid version bump.	2017-06-08 14:06:41 -04:00
Nick Mathewson	875b1fbfba	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-06-08 14:06:28 -04:00
Nick Mathewson	6e90d75061	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-06-08 14:06:16 -04:00
Nick Mathewson	2f6be06f6a	Merge branch 'maint-0.2.6' into maint-0.2.7-redux ... "ours" merge to avoid version bump.	2017-06-08 14:06:06 -04:00
Nick Mathewson	eb92d11f53	Merge branch 'maint-0.2.5' into maint-0.2.6 ... "ours" merge to avoid version bump.	2017-06-08 14:05:59 -04:00
Nick Mathewson	1a7af7470f	Merge branch 'maint-0.2.4' into maint-0.2.5 ... "ours" merge to avoid version bump.	2017-06-08 14:05:37 -04:00
Nick Mathewson	6e7551c50d	Add -dev to version number.	2017-06-08 14:05:32 -04:00
Nick Mathewson	90758b2606	Add -dev to version number.	2017-06-08 14:05:29 -04:00
Nick Mathewson	5e554215dd	Add -dev to version number.	2017-06-08 14:05:27 -04:00
Nick Mathewson	5c47b92747	Add -dev to version number.	2017-06-08 14:05:22 -04:00
Nick Mathewson	44c8cb986d	Add -dev to version number.	2017-06-08 14:05:18 -04:00
Nick Mathewson	95a88f7283	Add -dev to version number.	2017-06-08 14:05:16 -04:00
Nick Mathewson	f3804f5999	Add -dev to version number.	2017-06-08 14:05:13 -04:00
Nick Mathewson	ec3ce773ad	Add -dev to version number.	2017-06-08 14:05:08 -04:00
Nick Mathewson	dc47d936d4	fwd-port more changelogs (0.2.4 through 0.2.8)	2017-06-08 10:15:41 -04:00
Nick Mathewson	a95202d781	Tweak 0.2.9.11 changelog	2017-06-08 09:48:12 -04:00
Nick Mathewson	a77a479fa5	copy changelog and releasenotes forward from 0.2.9, 0.3.0	2017-06-08 09:35:47 -04:00
Nick Mathewson	d2839eeac9	Fold TROVE-2017-00[45] into changelog	2017-06-08 09:32:00 -04:00
Nick Mathewson	40aa1b1fdc	Merge branch 'maint-0.3.0'	2017-06-08 09:29:36 -04:00
Nick Mathewson	d389480da5	Merge branch 'maint-0.2.9' into maint-0.3.0 ... "ours" merge to avoid version bump.	2017-06-08 09:29:23 -04:00
Nick Mathewson	8239af0d9c	Merge branch 'maint-0.2.8' into maint-0.2.9 ... "ours" merge to avoid version bump.	2017-06-08 09:29:12 -04:00
Nick Mathewson	bff08ed8eb	Merge branch 'maint-0.2.7-redux' into maint-0.2.8 ... "ours" merge to avoid version bump.	2017-06-08 09:29:05 -04:00
Nick Mathewson	4915d9c5a7	Merge branch 'maint-0.2.6' into maint-0.2.7-redux ... "ours" merge to avoid version bump.	2017-06-08 09:28:54 -04:00
Nick Mathewson	b796ad0300	Merge branch 'maint-0.2.5' into maint-0.2.6 ... "ours" merge to avoid version bump.	2017-06-08 09:28:29 -04:00
Nick Mathewson	77c5d8c738	Merge branch 'maint-0.2.4' into maint-0.2.5 ... "ours" merge to avoid version bump.	2017-06-08 09:28:11 -04:00
Nick Mathewson	792931d53d	Bump to 0.2.8.14	2017-06-08 09:27:54 -04:00
Nick Mathewson	2efe0275bc	Bump to 0.2.7.8	2017-06-08 09:27:34 -04:00
Nick Mathewson	0de4620375	Bump to 0.2.6.12	2017-06-08 09:26:20 -04:00
Nick Mathewson	fa73f59ad3	bump to 0.2.5.14	2017-06-08 09:26:00 -04:00
Nick Mathewson	8e439a66f3	Bump to 0.2.4.29	2017-06-08 09:25:31 -04:00
Nick Mathewson	b533220249	bump to 0.2.9.11	2017-06-08 09:24:38 -04:00
Nick Mathewson	a0664fd0c3	bump to 0.3.0.8	2017-06-08 09:24:28 -04:00
Nick Mathewson	78d4200abe	Bump to 0.3.1.3-alpha.	2017-06-08 09:24:16 -04:00
Nick Mathewson	d15d09a968	Merge branch 'maint-0.2.7-redux' into maint-0.2.8	2017-06-08 09:21:15 -04:00
Nick Mathewson	c1646d6e89	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-06-08 09:21:15 -04:00
Nick Mathewson	40bccc2004	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-06-08 09:21:15 -04:00
Nick Mathewson	dec7998f5c	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-06-08 09:21:15 -04:00
Nick Mathewson	987c7cae70	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-06-08 09:21:15 -04:00
Nick Mathewson	53011e3e54	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-06-08 09:21:15 -04:00