30715 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	0ea508ec6f	Merge branch 'maint-0.3.4' into maint-0.3.5 ... "ours" merge to avoid version bump.	2018-11-02 13:01:53 -04:00
Nick Mathewson	5acf6f8717	Bump to 0.3.4.9-dev	2018-11-02 13:01:32 -04:00
Nick Mathewson	339ff694a7	Merge branch 'maint-0.3.5'	2018-11-02 11:29:00 -04:00
Nick Mathewson	3c691613c6	forward-port 0.3.4.9 changelog and releasenotes	2018-11-02 11:28:57 -04:00
Nick Mathewson	f57fd0318a	Merge remote-tracking branch 'tor-github/pr/397'	2018-11-02 10:01:26 -04:00
Nick Mathewson	2ac24b503b	Merge branch 'maint-0.3.5'	2018-11-02 09:39:16 -04:00
Nick Mathewson	a6c7e01584	Merge branch 'bug27963_wallclock' into maint-0.3.5	2018-11-02 09:39:13 -04:00
Nick Mathewson	084a5a13c7	Merge branch 'bug27963_wallclock'	2018-11-02 09:38:26 -04:00
Nick Mathewson	be197339ba	Merge branch 'maint-0.3.5'	2018-11-02 09:09:01 -04:00
Nick Mathewson	ff05162710	Merge branch 'maint-0.3.4' into maint-0.3.5 ... "ours" to avoid version bump.	2018-11-02 09:08:53 -04:00
Nick Mathewson	d8d4fe83d0	Bump to 0.3.4.9	2018-11-02 09:08:45 -04:00
Nick Mathewson	b71f93f532	Merge branch 'maint-0.3.5'	2018-11-02 09:06:38 -04:00
Nick Mathewson	bbdf56aed6	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-02 09:06:38 -04:00
Nick Mathewson	bfe8f50cc8	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-02 09:06:37 -04:00
Nick Mathewson	6bd069630a	Merge branch 'bug26470_032' into maint-0.3.3	2018-11-02 09:06:32 -04:00
Nick Mathewson	a0ab950bfa	Merge branch 'maint-0.3.5'	2018-11-02 09:05:18 -04:00
Nick Mathewson	a3fc93b8dd	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-02 09:05:18 -04:00
Nick Mathewson	f288f2478a	Merge branch 'bug26896_034' into maint-0.3.4	2018-11-02 09:05:14 -04:00
Nick Mathewson	5ac0e9113b	Merge branch 'maint-0.3.5'	2018-11-02 09:04:25 -04:00
Nick Mathewson	d409565e38	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-11-02 09:04:25 -04:00
Nick Mathewson	8ed4f1ee84	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-11-02 09:04:25 -04:00
Nick Mathewson	e847909b71	Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3	2018-11-02 09:04:20 -04:00
Nick Mathewson	0ce1f2d466	Declare the subsystem structure.	2018-11-01 12:55:52 -04:00
George Kadianakis	da716fdfbb	Add tests for the string_is_utf8_no_bom() function.	2018-11-01 12:55:04 +02:00
George Kadianakis	a0402c6f33	Add changes file for #27707.	2018-11-01 12:40:52 +02:00
Fernando Fernandez Mancera	f60607ee96	Improve log message in hs_service.c ... Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>	2018-11-01 12:40:52 +02:00
Nick Mathewson	383b44553c	Merge branch 'ticket24393_036_01_squashed'	2018-10-31 11:07:15 -04:00
Neel Chauhan	e9adc200aa	Add test for nodes_in_same_family()	2018-10-31 11:07:03 -04:00
Nick Mathewson	0d124488f8	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-10-31 11:02:58 -04:00
Nick Mathewson	a2e034d7d9	Merge branch 'maint-0.3.5'	2018-10-31 11:02:58 -04:00
Nick Mathewson	158db532eb	Merge branch 'maint-0.3.3' into maint-0.3.4	2018-10-31 11:01:41 -04:00
Nick Mathewson	2a4506776e	Merge branch 'maint-0.3.5'	2018-10-31 11:01:41 -04:00
Nick Mathewson	59043665f8	Merge branch 'maint-0.3.4' into maint-0.3.5	2018-10-31 11:01:41 -04:00
Nick Mathewson	bcc1a71808	Merge branch 'maint-0.2.9' into maint-0.3.3	2018-10-31 11:01:40 -04:00
Nick Mathewson	0a824bd889	Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9	2018-10-31 11:01:36 -04:00
Nick Mathewson	672e26cad8	Merge branch 'networkstatus_mmap_merge'	2018-10-31 10:06:30 -04:00
Nick Mathewson	988d4903a3	Merge branch 'networkstatus_mmap' into networkstatus_mmap_merge	2018-10-31 09:04:12 -04:00
Nick Mathewson	a182301152	Fix memory leak (#28257, CID 1440805).	2018-10-31 08:30:48 -04:00
Neel Chauhan	067b16eae2	Check IPv6 subnets as well as IPv4 subnets where possible when choosing client paths	2018-10-30 15:02:43 -04:00
David Goulet	aa1ae1343a	Merge branch 'maint-0.3.5'	2018-10-30 11:44:14 -04:00
David Goulet	488969fe9c	Merge branch 'tor-github/pr/438' into maint-0.3.5	2018-10-30 11:43:54 -04:00
David Goulet	124c43704c	Merge branch 'maint-0.3.5'	2018-10-30 11:37:44 -04:00
David Goulet	95559279e1	Merge branch 'tor-github/pr/415' into maint-0.3.5	2018-10-30 11:36:36 -04:00
David Goulet	1c5c3f353a	Merge branch 'maint-0.3.5'	2018-10-30 11:29:30 -04:00
David Goulet	6c9d678ff6	hs-v3: Add changes file for 28026 ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2018-10-30 11:28:53 -04:00
Mike Tigas	d023de945a	tweak manpage bits about v3 onion svc client auth ... make a couple things more explicit, like not needing to set "HiddenServiceAuthorizeClient" & etc	2018-10-30 11:25:24 -04:00
David Goulet	cdb065d6b2	Merge branch 'maint-0.3.5'	2018-10-30 10:55:10 -04:00
Neel Chauhan	9b72dca953	Add changes file for Bug #28127	2018-10-30 10:49:03 -04:00
Neel Chauhan	cd9914d9f9	Add test for HiddenServiceAuthorizeClient and v3 onion services	2018-10-30 10:49:03 -04:00
Neel Chauhan	82b3a02302	Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion	2018-10-30 10:48:56 -04:00