]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoRemove false positives from channel_is_client()
Roger Dingledine [Tue, 16 Jan 2018 03:33:40 +0000 (22:33 -0500)] 
Remove false positives from channel_is_client()

Fix a set of false positives where relays would consider connections
to other relays as being client-only connections (and thus e.g.
deserving different link padding schemes) if those relays fell out
of the consensus briefly.

Now we look only at the initial handshake and whether the connection
authenticated as a relay.

Fixes bug 24898; bugfix on 0.3.1.1-alpha.

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 8 Jan 2018 16:10:36 +0000 (11:10 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 8 Jan 2018 16:10:36 +0000 (11:10 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoAdd changes file for new fallback directory list.
Nick Mathewson [Mon, 8 Jan 2018 16:09:08 +0000 (11:09 -0500)] 
Add changes file for new fallback directory list.

7 years agoAdd 7 other fallback dirs from teor's tests
Nick Mathewson [Mon, 8 Jan 2018 16:03:44 +0000 (11:03 -0500)] 
Add 7 other fallback dirs from teor's tests

These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"

7 years agoUpdate the fallback_dirs.inc file: part 1
Nick Mathewson [Mon, 8 Jan 2018 15:57:06 +0000 (10:57 -0500)] 
Update the fallback_dirs.inc file: part 1

This takes the updated fallback_dirs_2018_01_06_CA.inc from
pastly's scan.

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 8 Jan 2018 14:34:57 +0000 (09:34 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 8 Jan 2018 14:34:56 +0000 (09:34 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.9
Nick Mathewson [Mon, 8 Jan 2018 14:34:56 +0000 (09:34 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.9

7 years agoUpdate geoip and geoip6 to the January 5 2018 database.
Karsten Loesing [Mon, 8 Jan 2018 10:36:38 +0000 (11:36 +0100)] 
Update geoip and geoip6 to the January 5 2018 database.

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 5 Jan 2018 21:41:34 +0000 (16:41 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 5 Jan 2018 21:41:34 +0000 (16:41 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'teor_ticket24681_028' into maint-0.2.9
Nick Mathewson [Fri, 5 Jan 2018 21:41:31 +0000 (16:41 -0500)] 
Merge branch 'teor_ticket24681_028' into maint-0.2.9

7 years agofix a wide line
Nick Mathewson [Fri, 5 Jan 2018 16:28:23 +0000 (11:28 -0500)] 
fix a wide line

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 3 Jan 2018 13:59:59 +0000 (08:59 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 3 Jan 2018 13:59:59 +0000 (08:59 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'bug24633_029' into maint-0.2.9
Nick Mathewson [Wed, 3 Jan 2018 13:59:52 +0000 (08:59 -0500)] 
Merge branch 'bug24633_029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 2 Jan 2018 15:10:28 +0000 (10:10 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 2 Jan 2018 15:10:28 +0000 (10:10 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
Nick Mathewson [Tue, 2 Jan 2018 15:09:44 +0000 (10:09 -0500)] 
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

7 years agoClear the address when we can't choose a reachable address
teor [Sun, 24 Dec 2017 14:53:14 +0000 (01:53 +1100)] 
Clear the address when we can't choose a reachable address

When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.

This is a precautionary measure, because some callers do not check the
return value.

Fixes bug 24736; bugfix on 0.2.8.2-alpha.

7 years agoMake the default DirAuthorityFallbackRate 0.1
teor [Fri, 22 Dec 2017 13:00:18 +0000 (00:00 +1100)] 
Make the default DirAuthorityFallbackRate 0.1

This makes clients on the public tor network prefer to bootstrap off fallback
directory mirrors.

This is a follow-up to 24679, which removed weights from the default fallbacks.

Implements ticket 24681.

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 21 Dec 2017 15:50:06 +0000 (10:50 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 21 Dec 2017 15:49:40 +0000 (10:49 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoUse monotime_coarse_absolute_msec() in destroy queue
Nick Mathewson [Thu, 21 Dec 2017 15:48:37 +0000 (10:48 -0500)] 
Use monotime_coarse_absolute_msec() in destroy queue

This way it will match the insert queue in 029 and later.

7 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 21 Dec 2017 15:43:12 +0000 (10:43 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.8 maint-0.2.8
Nick Mathewson [Thu, 21 Dec 2017 15:43:06 +0000 (10:43 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

7 years agoMerge branch 'bug24666_squashed_025' into maint-0.2.5
Nick Mathewson [Thu, 21 Dec 2017 15:40:10 +0000 (10:40 -0500)] 
Merge branch 'bug24666_squashed_025' into maint-0.2.5

7 years agoMove free to end of test function so coverity won't complain.
Nick Mathewson [Thu, 21 Dec 2017 15:39:29 +0000 (10:39 -0500)] 
Move free to end of test function so coverity won't complain.

7 years agoMove destroy cells into a separate queue type of their own, to save RAM
Nick Mathewson [Tue, 19 Dec 2017 18:53:52 +0000 (13:53 -0500)] 
Move destroy cells into a separate queue type of their own, to save RAM

We've been seeing problems with destroy cells queues taking up a
huge amount of RAM.  We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.

Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 20 Dec 2017 17:15:24 +0000 (12:15 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 20 Dec 2017 17:15:24 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 20 Dec 2017 17:15:23 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Wed, 20 Dec 2017 17:15:23 +0000 (12:15 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

7 years agoUpdate geoip and geoip6 to the December 6 2017 database.
Karsten Loesing [Wed, 20 Dec 2017 16:36:29 +0000 (17:36 +0100)] 
Update geoip and geoip6 to the December 6 2017 database.

7 years agoFix the clz32 and clz64 settings on MSVC.
Nick Mathewson [Wed, 20 Dec 2017 14:34:25 +0000 (09:34 -0500)] 
Fix the clz32 and clz64 settings on MSVC.

Fixes bug 24633; bugfix on 0.2.9.1-alpha.

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 12 Dec 2017 14:13:12 +0000 (09:13 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agorename changes file
Nick Mathewson [Tue, 12 Dec 2017 14:13:05 +0000 (09:13 -0500)] 
rename changes file

7 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 11 Dec 2017 21:56:31 +0000 (16:56 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'bug24167_025' into maint-0.2.5
Nick Mathewson [Mon, 11 Dec 2017 21:56:28 +0000 (16:56 -0500)] 
Merge branch 'bug24167_025' into maint-0.2.5

7 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 11 Dec 2017 21:54:14 +0000 (16:54 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:54:14 +0000 (16:54 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 11 Dec 2017 21:54:14 +0000 (16:54 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Mon, 11 Dec 2017 21:54:11 +0000 (16:54 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

7 years agoMerge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
Nick Mathewson [Mon, 11 Dec 2017 21:53:02 +0000 (16:53 -0500)] 
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:51:58 +0000 (16:51 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 11 Dec 2017 21:51:58 +0000 (16:51 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

7 years agoMerge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
Nick Mathewson [Mon, 11 Dec 2017 21:51:54 +0000 (16:51 -0500)] 
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

7 years agoMerge branch 'bug24086_031' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:49:01 +0000 (16:49 -0500)] 
Merge branch 'bug24086_031' into maint-0.3.1

7 years agoMerge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:48:44 +0000 (16:48 -0500)] 
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1

7 years agoMerge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:45:54 +0000 (16:45 -0500)] 
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1

7 years agoMerge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:43:41 +0000 (16:43 -0500)] 
Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 11 Dec 2017 21:43:24 +0000 (16:43 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid taking the 030 version of 23862.

7 years agoMerge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
Nick Mathewson [Mon, 11 Dec 2017 21:41:28 +0000 (16:41 -0500)] 
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
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 [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -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 [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Fri, 1 Dec 2017 17:13:39 +0000 (12:13 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoFix a clang compilation warning in rendservice.c
Nick Mathewson [Fri, 1 Dec 2017 17:13:15 +0000 (12:13 -0500)] 
Fix a clang compilation warning in rendservice.c

Fixes bug 24480; bugfix on 0.2.5.16.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 1 Dec 2017 14:35:25 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:35:16 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:35:07 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:34:47 +0000 (09:34 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump.

8 years agobump to 0.3.1.9-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:20 +0000 (09:34 -0500)] 
bump to 0.3.1.9-dev

8 years agobump to 0.3.0.13-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:09 +0000 (09:34 -0500)] 
bump to 0.3.0.13-dev

8 years agobump to 0.2.9.14-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:00 +0000 (09:34 -0500)] 
bump to 0.2.9.14-dev

8 years agobump to 0.2.8.17-dev
Nick Mathewson [Fri, 1 Dec 2017 14:33:51 +0000 (09:33 -0500)] 
bump to 0.2.8.17-dev

8 years agobump to 0.2.5.16-dev
Nick Mathewson [Fri, 1 Dec 2017 14:33:41 +0000 (09:33 -0500)] 
bump to 0.2.5.16-dev

8 years agoAdd changes file for #23862.
George Kadianakis [Wed, 25 Oct 2017 16:54:48 +0000 (19:54 +0300)] 
Add changes file for #23862.

8 years agoRemove a duplicate call to update_microdesc_downloads()
George Kadianakis [Wed, 25 Oct 2017 16:18:38 +0000 (19:18 +0300)] 
Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.

8 years agoUpdate entry guard state whenever we download a consensus.
George Kadianakis [Wed, 25 Oct 2017 16:18:25 +0000 (19:18 +0300)] 
Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha

8 years agoAdd changes file for #23862.
George Kadianakis [Wed, 25 Oct 2017 16:54:48 +0000 (19:54 +0300)] 
Add changes file for #23862.

8 years agoRemove a duplicate call to update_microdesc_downloads()
George Kadianakis [Wed, 25 Oct 2017 16:18:38 +0000 (19:18 +0300)] 
Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.

8 years agoUpdate entry guard state whenever we download a consensus.
George Kadianakis [Wed, 25 Oct 2017 16:18:25 +0000 (19:18 +0300)] 
Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha

8 years agoversion bump to 0.3.1.9
Nick Mathewson [Thu, 30 Nov 2017 17:25:48 +0000 (12:25 -0500)] 
version bump to 0.3.1.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 30 Nov 2017 17:25:07 +0000 (12:25 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" to avoid version bump.

8 years agoversion bump to 0.3.0.13
Nick Mathewson [Thu, 30 Nov 2017 17:25:01 +0000 (12:25 -0500)] 
version bump to 0.3.0.13

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

8 years agoversion bump to 0.2.9.14
Nick Mathewson [Thu, 30 Nov 2017 17:24:07 +0000 (12:24 -0500)] 
version bump to 0.2.9.14

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 30 Nov 2017 17:22:38 +0000 (12:22 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.

8 years agoversion bump to 0.2.8.17
Nick Mathewson [Thu, 30 Nov 2017 17:22:32 +0000 (12:22 -0500)] 
version bump to 0.2.8.17

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 30 Nov 2017 17:21:36 +0000 (12:21 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" to avoid version bump

8 years agobump to 0.2.5.16
Nick Mathewson [Thu, 30 Nov 2017 17:19:48 +0000 (12:19 -0500)] 
bump to 0.2.5.16

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -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 [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -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 [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'trove-2017-012_030' into maint-0.3.0
Nick Mathewson [Thu, 30 Nov 2017 17:07:43 +0000 (12:07 -0500)] 
Merge branch 'trove-2017-012_030' into maint-0.3.0

8 years agoMerge branch 'trove-2017-010_029' into maint-0.2.9
Nick Mathewson [Thu, 30 Nov 2017 17:07:26 +0000 (12:07 -0500)] 
Merge branch 'trove-2017-010_029' into maint-0.2.9

8 years agoMerge branch 'trove-2017-012_025' into maint-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:06:21 +0000 (12:06 -0500)] 
Merge branch 'trove-2017-012_025' into maint-0.2.5

8 years agoMerge branch 'trove-2017-011_025' into maint-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:06:17 +0000 (12:06 -0500)] 
Merge branch 'trove-2017-011_025' into maint-0.2.5

8 years agoMerge branch 'trove-2017-009_025' into maint-0.2.5
Nick Mathewson [Thu, 30 Nov 2017 17:05:59 +0000 (12:05 -0500)] 
Merge branch 'trove-2017-009_025' into maint-0.2.5

8 years agoFix changes file
Nick Mathewson [Thu, 30 Nov 2017 16:52:40 +0000 (11:52 -0500)] 
Fix changes file

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 30 Nov 2017 16:48:12 +0000 (11:48 -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 [Thu, 30 Nov 2017 16:48:12 +0000 (11:48 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'bug21394_029' into maint-0.2.9
Nick Mathewson [Thu, 30 Nov 2017 16:48:06 +0000 (11:48 -0500)] 
Merge branch 'bug21394_029' into maint-0.2.9

8 years agoUse local descriptor object to exclude self in path selection
David Goulet [Wed, 29 Nov 2017 00:02:00 +0000 (19:02 -0500)] 
Use local descriptor object to exclude self in path selection

TROVE-2017-12. Severity: Medium

When choosing a random node for a circuit, directly use our router
descriptor to exclude ourself instead of the one in the global
descriptor list. That list could be empty because tor could be
downloading them which could lead to not excluding ourself.

Closes #21534