19754 commits

Author	SHA1	Message	Date
Nick Mathewson	44e8aaa9aa	Adjust test to allow hyphens too.	2017-10-24 19:33:38 -04:00
Isis Lovecruft	02cde0d939	test: Add unittest for descriptors with BridgeDistribution option.	2017-10-24 19:26:24 -04:00
Isis Lovecruft	b0e10f23ba	doc: Improve documentation for check_bridge_distribution_setting().	2017-10-24 19:26:24 -04:00
Nick Mathewson	613b18f0af	Always set bridge-distribution-request on bridges' descriptors. ... Also, warn the user if the BridgeDistribution option is unrecognized, and reject the value if it is invalid.	2017-10-24 19:26:24 -04:00
Roger Dingledine	ebab521525	Add new BridgeDistribution config option ... Bridge relays can use it to add a "bridge-distribution-request" line to their bridge descriptor, which tells BridgeDB how they'd like their bridge address to be given out. Implements tickets 18329.	2017-10-24 19:26:24 -04:00
Taylor Yu	9b60acd4d4	Rewrite bridge addresses earlier ... Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing node_t for it.	2017-10-24 17:35:17 -05: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	cbb41ddfef	bump to 0.3.1.8	2017-10-24 09:09:50 -04:00
Nick Mathewson	743eee4930	bump to 0.2.5.15	2017-10-24 09:09:00 -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	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	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	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	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	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	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	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
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
Nick Mathewson	68dea082e7	Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9	2017-10-23 08:46:26 -04:00
Nick Mathewson	5d219ecf98	Update Longclaw's IP address; fixes 23592.	2017-10-17 14:00:30 -04:00
Nick Mathewson	8652f3e9e8	Fix memory leak when freeing socket_table in KIST.	2017-10-17 13:40:31 -04:00
teor	5bca66be49	Clear the address when node_get_prim_orport() returns early ... Fixes bug 23874; bugfix on 0.2.8.2-alpha.	2017-10-15 16:48:36 -04:00
Nick Mathewson	bdf60fc7ce	Merge branch 'maint-0.3.0' into maint-0.3.1	2017-10-05 11:03:36 -04:00
Nick Mathewson	0cd7c1af37	Merge branch 'maint-0.3.1'	2017-10-05 11:03:36 -04:00
Nick Mathewson	2984d99165	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-10-05 11:03:35 -04:00
Nick Mathewson	d6bdec1595	Merge branch 'maint-0.2.5' into maint-0.2.8	2017-10-05 11:03:35 -04:00
Nick Mathewson	ad7db10770	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-10-05 11:03:35 -04:00
Karsten Loesing	b9d9b16b76	Update geoip and geoip6 to the October 4 2017 database.	2017-10-05 16:56:14 +02:00