27696 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	51de3a1c15	Merge branch 'maint-0.3.2'	2017-10-24 09:10:43 -04:00
Nick Mathewson	cce1a6efa6	Merge branch 'maint-0.3.1' into maint-0.3.2 ... "ours" merge to avoid version bump	2017-10-24 09:10:37 -04:00
Nick Mathewson	38a58076e9	Merge branch 'maint-0.3.0' into maint-0.3.1 ... "ours" merge to avoid version bump	2017-10-24 09:10:30 -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	cbb41ddfef	bump to 0.3.1.8	2017-10-24 09:09:50 -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	abbd6a36fc	Merge branch 'maint-0.3.2'	2017-10-24 08:25:29 -04:00
Nick Mathewson	0d4addfc73	Merge branch 'bug23952_032' into maint-0.3.2	2017-10-24 08:24:12 -04:00
Nick Mathewson	f0a6ea0bfd	Merge branch 'maint-0.3.0' into maint-0.3.1	2017-10-23 15:55:48 -04:00
Nick Mathewson	f7707c9031	Merge branch 'maint-0.3.2'	2017-10-23 15:55:48 -04:00
Nick Mathewson	b1d6cf2508	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-10-23 15:55:48 -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	48ee85e0c6	Have LOG_PROTOCOL_WARN call its own function ... Also, make the function that implements LOG_PROTOCOL_WARN use a cached value of the desired loglevel, rather than calling get_options().	2017-10-23 12:22:26 -04:00
Nick Mathewson	880d596f4d	Merge branch 'maint-0.3.2'	2017-10-23 09:22:57 -04:00
Nick Mathewson	8b8d501040	Merge branch 'maint-0.3.1' into maint-0.3.2 ... "ours" merge to avoid taking af33fdd7c1	2017-10-23 09:22:43 -04:00
Nick Mathewson	af33fdd7c1	Remove the length limit from write_http_status_line ... Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7ba, where arma said "get rid of the scary 256-byte-buf landmine".	2017-10-23 09:21:22 -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	eac4c374e4	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 09:11:10 -04:00
Nick Mathewson	49e8352f16	Merge branch 'maint-0.3.2'	2017-10-23 09:11:10 -04:00
Nick Mathewson	6a7aa47357	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-10-23 09:11:10 -04:00
Nick Mathewson	85115796bb	Merge branch 'maint-0.3.0' into maint-0.3.1	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	1db5081ba1	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-10-23 09:06:34 -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	d99c6b7252	Merge branch 'maint-0.3.2'	2017-10-23 09:06:34 -04:00
Nick Mathewson	009141c6a8	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-10-23 09:06:34 -04:00
Nick Mathewson	23e3d57e12	Merge branch 'maint-0.3.0' into maint-0.3.1	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	97046436b2	Merge branch 'maint-0.3.2'	2017-10-23 08:59:12 -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	783e458c07	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 08:59:11 -04:00
Nick Mathewson	b8dedaee74	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-10-23 08:59:11 -04:00
Nick Mathewson	df57d1e0c0	Merge branch 'maint-0.3.0' into maint-0.3.1	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	c018aa8196	Merge branch 'maint-0.3.2'	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	74e8fd22c9	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-23 08:53:25 -04:00
Nick Mathewson	578eead1c8	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-10-23 08:53:25 -04:00
Nick Mathewson	b68de63eb6	Merge branch 'maint-0.3.0' into maint-0.3.1	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