]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoIntroduce new guard restriction and use it to skip outdated dirs.
George Kadianakis [Mon, 6 Nov 2017 17:38:47 +0000 (19:38 +0200)] 
Introduce new guard restriction and use it to skip outdated dirs.

8 years agoIntroduce cache for outdated microdesc dirservers.
George Kadianakis [Mon, 6 Nov 2017 12:48:22 +0000 (14:48 +0200)] 
Introduce cache for outdated microdesc dirservers.

We gonna use this cache to avoid dirservers without outdated md info.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 14 Nov 2017 01:36:04 +0000 (20:36 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 14 Nov 2017 01:36:04 +0000 (20:36 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug22895_027' into maint-0.2.9
Nick Mathewson [Tue, 14 Nov 2017 01:35:59 +0000 (20:35 -0500)] 
Merge branch 'bug22895_027' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 17:57:58 +0000 (12:57 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 13 Nov 2017 17:57:58 +0000 (12:57 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 13 Nov 2017 17:57:58 +0000 (12:57 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'bug23291_028' into maint-0.2.8
Nick Mathewson [Mon, 13 Nov 2017 17:57:55 +0000 (12:57 -0500)] 
Merge branch 'bug23291_028' into maint-0.2.8

8 years agohs-v3: Fix consensus param "hsdir-interval" name
David Goulet [Mon, 13 Nov 2017 16:48:56 +0000 (11:48 -0500)] 
hs-v3: Fix consensus param "hsdir-interval" name

The dir-spec.txt specifies it to be "hsdir_interval" (underscore).

Fixes #24262

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 13 Nov 2017 16:18:02 +0000 (11:18 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:18:02 +0000 (11:18 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
Nick Mathewson [Mon, 13 Nov 2017 16:17:58 +0000 (11:17 -0500)] 
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 13 Nov 2017 16:15:50 +0000 (11:15 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:15:50 +0000 (11:15 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'bug8185_025' into maint-0.2.9
Nick Mathewson [Mon, 13 Nov 2017 16:15:47 +0000 (11:15 -0500)] 
Merge branch 'bug8185_025' into maint-0.2.9

8 years agoMerge branch 'bug8185_031' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:15:40 +0000 (11:15 -0500)] 
Merge branch 'bug8185_031' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 13 Nov 2017 16:13:22 +0000 (11:13 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:13:22 +0000 (11:13 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'ticket21953_029' into maint-0.2.9
Nick Mathewson [Mon, 13 Nov 2017 16:13:18 +0000 (11:13 -0500)] 
Merge branch 'ticket21953_029' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Sat, 11 Nov 2017 17:23:34 +0000 (12:23 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoUpdate geoip and geoip6 to the November 6 2017 database.
Karsten Loesing [Fri, 10 Nov 2017 09:14:09 +0000 (10:14 +0100)] 
Update geoip and geoip6 to the November 6 2017 database.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 31 Oct 2017 15:43:14 +0000 (11:43 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 31 Oct 2017 15:43:14 +0000 (11:43 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
Nick Mathewson [Tue, 31 Oct 2017 15:43:07 +0000 (11:43 -0400)] 
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 25 Oct 2017 13:28:49 +0000 (09:28 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 25 Oct 2017 13:28:41 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 25 Oct 2017 13:28:29 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Wed, 25 Oct 2017 13:28:15 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump

8 years agobump to 0.3.1.8-dev
Nick Mathewson [Wed, 25 Oct 2017 13:28:05 +0000 (09:28 -0400)] 
bump to 0.3.1.8-dev

8 years agobump to 0.3.0.12-dev
Nick Mathewson [Wed, 25 Oct 2017 13:27:50 +0000 (09:27 -0400)] 
bump to 0.3.0.12-dev

8 years agobump to 0.2.9.13-dev
Nick Mathewson [Wed, 25 Oct 2017 13:27:23 +0000 (09:27 -0400)] 
bump to 0.2.9.13-dev

8 years agobump to 0.2.8.16-dev
Nick Mathewson [Wed, 25 Oct 2017 13:27:07 +0000 (09:27 -0400)] 
bump to 0.2.8.16-dev

8 years agobump to 0.2.5.15-dev
Nick Mathewson [Wed, 25 Oct 2017 13:26:53 +0000 (09:26 -0400)] 
bump to 0.2.5.15-dev

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 24 Oct 2017 13:11:33 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 24 Oct 2017 13:11:24 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump

8 years agobump version in the other places :/
Nick Mathewson [Tue, 24 Oct 2017 13:11:17 +0000 (09:11 -0400)] 
bump version in the other places :/

8 years agobump version in the other places :/
Nick Mathewson [Tue, 24 Oct 2017 13:11:07 +0000 (09:11 -0400)] 
bump version in the other places :/

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 24 Oct 2017 13:10:30 +0000 (09:10 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 24 Oct 2017 13:10:24 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 24 Oct 2017 13:10:17 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Tue, 24 Oct 2017 13:10:04 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump

8 years agobump to 0.3.1.8
Nick Mathewson [Tue, 24 Oct 2017 13:09:50 +0000 (09:09 -0400)] 
bump to 0.3.1.8

8 years agobump to 0.3.0.12
Nick Mathewson [Tue, 24 Oct 2017 13:09:35 +0000 (09:09 -0400)] 
bump to 0.3.0.12

8 years agobump to 0.2.9.13
Nick Mathewson [Tue, 24 Oct 2017 13:09:26 +0000 (09:09 -0400)] 
bump to 0.2.9.13

8 years agobump to 0.2.8.16
Nick Mathewson [Tue, 24 Oct 2017 13:09:10 +0000 (09:09 -0400)] 
bump to 0.2.8.16

8 years agobump to 0.2.5.15
Nick Mathewson [Tue, 24 Oct 2017 13:09:00 +0000 (09:09 -0400)] 
bump to 0.2.5.15

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 19:55:48 +0000 (15:55 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 19:55:08 +0000 (15:55 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 19:53:45 +0000 (15:53 -0400)] 
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

8 years agoRemove the length limit from write_http_status_line
Nick Mathewson [Mon, 23 Oct 2017 13:21:22 +0000 (09:21 -0400)] 
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 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoAdjust test, now that there are 9 dirauths again
Nick Mathewson [Mon, 23 Oct 2017 13:11:07 +0000 (09:11 -0400)] 
Adjust test, now that there are 9 dirauths again

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Mon, 23 Oct 2017 13:04:56 +0000 (09:04 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agodirauth: Add bastet to the default authorities
David Goulet [Thu, 19 Oct 2017 20:08:43 +0000 (16:08 -0400)] 
dirauth: Add bastet to the default authorities

Fixes #23910

Based on a patch by dgoulet; backported to 0.2.5

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Mon, 23 Oct 2017 12:58:28 +0000 (08:58 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
Nick Mathewson [Mon, 23 Oct 2017 12:53:14 +0000 (08:53 -0400)] 
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:47:58 +0000 (08:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:47:58 +0000 (08:47 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'public/bug23081_025' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 12:47:52 +0000 (08:47 -0400)] 
Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:46:29 +0000 (08:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:46:29 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 12:46:26 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9

8 years agoUpdate Longclaw's IP address; fixes 23592.
Nick Mathewson [Tue, 17 Oct 2017 17:59:00 +0000 (13:59 -0400)] 
Update Longclaw's IP address; fixes 23592.

8 years agoClear the address when node_get_prim_orport() returns early
teor [Sun, 15 Oct 2017 20:45:15 +0000 (16:45 -0400)] 
Clear the address when node_get_prim_orport() returns early

Fixes bug 23874; bugfix on 0.2.8.2-alpha.

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 5 Oct 2017 15:04:59 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 5 Oct 2017 15:04:59 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 5 Oct 2017 15:04:59 +0000 (11:04 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 5 Oct 2017 15:04:59 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoadd missing subcategory in changes file
Nick Mathewson [Thu, 5 Oct 2017 15:04:54 +0000 (11:04 -0400)] 
add missing subcategory in changes file

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 5 Oct 2017 15:03:36 +0000 (11:03 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 5 Oct 2017 15:03:35 +0000 (11:03 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 5 Oct 2017 15:03:35 +0000 (11:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 5 Oct 2017 15:03:35 +0000 (11:03 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoUpdate geoip and geoip6 to the October 4 2017 database.
Karsten Loesing [Thu, 5 Oct 2017 14:56:14 +0000 (16:56 +0200)] 
Update geoip and geoip6 to the October 4 2017 database.

8 years agoMake changes in server_mode() affect workers; fix a crash.
Nick Mathewson [Mon, 2 Oct 2017 15:11:30 +0000 (11:11 -0400)] 
Make changes in server_mode() affect workers; fix a crash.

Without this fix, changes from client to bridge don't trigger
transition_affects_workers(), so we would never have actually
initialized the cpuworkers.

Fixes bug 23693.  Bugfix on 3bcdb26267502e0 0.2.6.3-alpha, which
fixed bug 14901 in the general case, but not on the case where
public_server_mode() did not change.

8 years agoClear outbuf_flushlen when we clear a connection's outbuf
Nick Mathewson [Fri, 29 Sep 2017 14:00:14 +0000 (10:00 -0400)] 
Clear outbuf_flushlen when we clear a connection's outbuf

When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0.  This could cause
an assertion failure later on in flush_buf().

Fixes bug 23690; bugfix on 0.2.6.1-alpha.

8 years agoMerge branch 'bug8185_025' into bug8185_031
Nick Mathewson [Fri, 29 Sep 2017 13:37:01 +0000 (09:37 -0400)] 
Merge branch 'bug8185_025' into bug8185_031

8 years agoDon't package cells onto marked circuits.
Nick Mathewson [Fri, 29 Sep 2017 13:26:16 +0000 (09:26 -0400)] 
Don't package cells onto marked circuits.

This caused a BUG log when we noticed that the circuit had no
channel.  The likeliest culprit for exposing that behavior is
d769cab3e5097980, where we made circuit_mark_for_close() NULL out
the n_chan and p_chan fields of the circuit.

Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think.

8 years agoMerge remote-tracking branch 'ahf-gitlab/bugs/23551-maint-0.3.1' into maint-0.3.1
Nick Mathewson [Thu, 28 Sep 2017 22:53:37 +0000 (18:53 -0400)] 
Merge remote-tracking branch 'ahf-gitlab/bugs/23551-maint-0.3.1' into maint-0.3.1

8 years agoBetter error handling when trying to compress/decompress into empty buffer.
Alexander Færøy [Thu, 28 Sep 2017 14:46:10 +0000 (16:46 +0200)] 
Better error handling when trying to compress/decompress into empty buffer.

This patch ensures that we return TOR_COMPRESS_BUFFER_FULL in case we
have a input bytes left to process, but are out of output buffer or in
case we need to finish where the compression implementation might need
to write an epilogue.

See: https://bugs.torproject.org/23551

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 22 Sep 2017 13:09:17 +0000 (09:09 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agohs: Avoid possible double circuit close on error
David Goulet [Thu, 21 Sep 2017 17:13:44 +0000 (13:13 -0400)] 
hs: Avoid possible double circuit close on error

Fixes #23610

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs: Avoid possible double circuit close on error
David Goulet [Thu, 21 Sep 2017 17:13:44 +0000 (13:13 -0400)] 
hs: Avoid possible double circuit close on error

Fixes #23610

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoBug 23608: Mock time for all channelpadding tests.
Mike Perry [Wed, 20 Sep 2017 22:37:05 +0000 (22:37 +0000)] 
Bug 23608: Mock time for all channelpadding tests.

8 years agochanges file for bug23568
Nick Mathewson [Wed, 20 Sep 2017 13:45:03 +0000 (09:45 -0400)] 
changes file for bug23568