24579 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	fea5c8a015	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-13 12:57:58 -05:00
Nick Mathewson	543fd89fb7	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-11-13 12:57:58 -05:00
Nick Mathewson	800797e7f3	Merge branch 'bug23291_028' into maint-0.2.8	2017-11-13 12:57:55 -05:00
Nick Mathewson	16bdb9e365	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-13 11:18:02 -05:00
Nick Mathewson	ab415ae950	Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9	2017-11-13 11:17:58 -05:00
Nick Mathewson	9092e9019a	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-13 11:15:50 -05:00
Nick Mathewson	666653758d	Merge branch 'bug8185_025' into maint-0.2.9	2017-11-13 11:15:47 -05:00
Nick Mathewson	ece63105d9	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-13 11:13:22 -05:00
Nick Mathewson	c928fb988a	Merge branch 'ticket21953_029' into maint-0.2.9	2017-11-13 11:13:18 -05:00
Nick Mathewson	c9b76a12f5	Merge branch 'maint-0.2.5' into maint-0.2.8	2017-11-11 12:23:33 -05:00
Nick Mathewson	5348c8996f	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-11 12:23:33 -05:00
Nick Mathewson	9666c620d5	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-11-11 12:23:33 -05:00
Karsten Loesing	6f8c32b7de	Update geoip and geoip6 to the November 6 2017 database.	2017-11-10 10:14:09 +01:00
Nick Mathewson	f2e23d38ab	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-31 11:43:14 -04:00
Nick Mathewson	04d4786cc4	Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9	2017-10-31 11:43:07 -04:00
Nick Mathewson	6ce8cc5dbb	Merge branch 'maint-0.2.9' into maint-0.3.0 ... "ours" merge to avoid version bump	2017-10-25 09:28:41 -04:00
Nick Mathewson	151d5ededf	Merge branch 'maint-0.2.8' into maint-0.2.9 ... "ours" merge to avoid version bump	2017-10-25 09:28:29 -04:00
Nick Mathewson	faf568fa7e	Merge branch 'maint-0.2.5' into maint-0.2.8 ... "ours" merge to avoid version bump	2017-10-25 09:28:15 -04:00
Nick Mathewson	4edbbee2fd	bump to 0.3.0.12-dev	2017-10-25 09:27:50 -04:00
Nick Mathewson	46091a88ca	bump to 0.2.9.13-dev	2017-10-25 09:27:23 -04:00
Nick Mathewson	9969b0dfda	bump to 0.2.8.16-dev	2017-10-25 09:27:07 -04:00
Nick Mathewson	82f8b27ff5	bump to 0.2.5.15-dev	2017-10-25 09:26:53 -04:00
Nick Mathewson	7bebd1b025	Merge branch 'maint-0.2.9' into maint-0.3.0 ... "ours" merge to avoid version bump	2017-10-24 09:11:24 -04:00
Nick Mathewson	5325e7ccab	bump version in the other places :/	2017-10-24 09:11:17 -04:00
Nick Mathewson	552b620280	bump version in the other places :/	2017-10-24 09:11:07 -04:00
Nick Mathewson	302b5f577d	Merge branch 'maint-0.2.9' into maint-0.3.0 ... "ours" merge to avoid version bump	2017-10-24 09:10:24 -04:00
Nick Mathewson	725f237104	Merge branch 'maint-0.2.8' into maint-0.2.9 ... "ours" merge to avoid version bump	2017-10-24 09:10:17 -04:00
Nick Mathewson	912ebf165f	Merge branch 'maint-0.2.5' into maint-0.2.8 ... "ours" merge to avoid version bump	2017-10-24 09:10:04 -04:00
Nick Mathewson	d913a7317b	bump to 0.3.0.12	2017-10-24 09:09:35 -04:00
Nick Mathewson	09d2ae562a	bump to 0.2.9.13	2017-10-24 09:09:26 -04:00
Nick Mathewson	d4befa035d	bump to 0.2.8.16	2017-10-24 09:09:10 -04:00
Nick Mathewson	743eee4930	bump to 0.2.5.15	2017-10-24 09:09:00 -04:00
Nick Mathewson	9ae4ffc076	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 15:55:08 -04:00
Nick Mathewson	b1bd1bf19f	Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9	2017-10-23 15:53:45 -04:00
Nick Mathewson	eac4c374e4	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 09:11:10 -04:00
Nick Mathewson	fcd5c3144a	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-10-23 09:11:10 -04:00
Nick Mathewson	a5f5bda462	Adjust test, now that there are 9 dirauths again	2017-10-23 09:11:07 -04:00
Nick Mathewson	c93ecb8189	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 09:06:34 -04:00
Nick Mathewson	1db5081ba1	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-10-23 09:06:34 -04:00
Nick Mathewson	8cc147aa83	Merge branch 'maint-0.2.5' into maint-0.2.8	2017-10-23 09:04:56 -04:00
David Goulet	15a699462d	dirauth: Add bastet to the default authorities ... Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5	2017-10-23 09:03:36 -04:00
Nick Mathewson	783e458c07	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 08:59:11 -04:00
Nick Mathewson	c958fda6e2	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-10-23 08:59:11 -04:00
Nick Mathewson	9a1b385462	Merge branch 'maint-0.2.5' into maint-0.2.8	2017-10-23 08:58:28 -04:00
Nick Mathewson	74e8fd22c9	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 08:53:25 -04:00
Nick Mathewson	132e2f69b1	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-10-23 08:53:25 -04:00
Nick Mathewson	6f87a85897	Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8	2017-10-23 08:53:14 -04:00
Nick Mathewson	35574d4a9a	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 08:47:58 -04:00
Nick Mathewson	fcaf3335b4	Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9	2017-10-23 08:47:52 -04:00
Nick Mathewson	d29e4c0597	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 08:46:29 -04:00