]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agogeoip: Increment and decrement functions for the geoip client cache
David Goulet [Fri, 2 Feb 2018 18:14:50 +0000 (13:14 -0500)] 
geoip: Increment and decrement functions for the geoip client cache

These functions protect againts over and underflow. They BUG() in case we
overflow the counter.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agogeoip: Hook the client history cache into the OOM handler
David Goulet [Fri, 2 Feb 2018 15:15:28 +0000 (10:15 -0500)] 
geoip: Hook the client history cache into the OOM handler

If the cache is using 20% of our maximum allowed memory, clean 10% of it. Same
behavior as the HS descriptor cache.

Closes #25122

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
Nick Mathewson [Fri, 19 Jan 2018 21:29:15 +0000 (16:29 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9

7 years agohs: Use hs_service_max_rdv_failures consensus param, defaulting to 2
Roger Dingledine [Fri, 19 Jan 2018 08:00:43 +0000 (03:00 -0500)] 
hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.9
Nick Mathewson [Fri, 19 Jan 2018 15:16:47 +0000 (10:16 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.9

7 years agoturn MAX_REND_FAILURES into a function
Roger Dingledine [Fri, 19 Jan 2018 07:38:07 +0000 (02:38 -0500)] 
turn MAX_REND_FAILURES into a function

no actual changes in behavior

7 years agoMAX_REND_FAILURES is 1, but we would try three times
Roger Dingledine [Mon, 15 Jan 2018 21:30:55 +0000 (16:30 -0500)] 
MAX_REND_FAILURES is 1, but we would try three times

Fix an "off by 2" error in counting rendezvous failures on the onion
service side.

While we thought we would stop the rendezvous attempt after one failed
circuit, we were actually making three circuit attempts before giving up.

Fixes bug 24895; bugfix on 0.0.6.

7 years agoWork around Travis CI ptrace regression
Taylor Yu [Wed, 10 Jan 2018 20:52:04 +0000 (14:52 -0600)] 
Work around Travis CI ptrace regression

Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly.  Set "sudo: required" to force non-container builds for
clang and work around this.

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.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 '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 '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 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 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.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.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 '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.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 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

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.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.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.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 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.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-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 '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

8 years agohs-v2: Remove any expiring intro from the retry list
David Goulet [Tue, 21 Nov 2017 15:16:08 +0000 (10:16 -0500)] 
hs-v2: Remove any expiring intro from the retry list

TROVE-2017-13. Severity: High.

In the unlikely case that a hidden service could be missing intro circuit(s),
that it didn't have enough directory information to open new circuits and that
an intro point was about to expire, a use-after-free is possible because of
the intro point object being both in the retry list and expiring list at the
same time.

The intro object would get freed after the circuit failed to open and then
access a second time when cleaned up from the expiring list.

Fixes #24313

8 years agoAvoid asking for passphrase on junky PEM input
Nick Mathewson [Sat, 11 Nov 2017 19:21:37 +0000 (14:21 -0500)] 
Avoid asking for passphrase on junky PEM input

Fixes bug 24246 and TROVE-2017-011.

This bug is so old, it's in Matej's code.  Seems to have been
introduced with e01522bbed6eea.

8 years agoHandle NULL input to protover_compute_for_old_tor()
Nick Mathewson [Sat, 11 Nov 2017 18:56:35 +0000 (13:56 -0500)] 
Handle NULL input to protover_compute_for_old_tor()

Fixes bug 24245; bugfix on 0.2.9.4-alpha. TROVE-2017-010.

8 years agoFix length of replaycache-checked data.
Nick Mathewson [Sat, 11 Nov 2017 18:40:21 +0000 (13:40 -0500)] 
Fix length of replaycache-checked data.

This is a regression; we should have been checking only the
public-key encrypted portion.  Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.

8 years agorelay: Change bandwidth stats interval to 24 hours
David Goulet [Wed, 22 Nov 2017 14:25:07 +0000 (09:25 -0500)] 
relay: Change bandwidth stats interval to 24 hours

Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.

Closes #23856

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 27 Nov 2017 14:09:34 +0000 (09:09 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoAdd bastet's ipv6 address
Sebastian Hahn [Thu, 23 Nov 2017 06:37:56 +0000 (07:37 +0100)] 
Add bastet's ipv6 address

Implements ticket 24394

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Sat, 18 Nov 2017 16:01:43 +0000 (11:01 -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 [Sat, 18 Nov 2017 16:01:33 +0000 (11:01 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'ticket18329_minimal_025' into maint-0.2.5
Nick Mathewson [Sat, 18 Nov 2017 16:00:45 +0000 (11:00 -0500)] 
Merge branch 'ticket18329_minimal_025' into maint-0.2.5

8 years agoFix a traceback when closing a blocked connection "immediately".
Nick Mathewson [Thu, 16 Nov 2017 16:45:15 +0000 (11:45 -0500)] 
Fix a traceback when closing a blocked connection "immediately".

When we close a connection via connection_close_immediately, we kill
its events immediately. But if it had been blocked on bandwidth
read/write, we could try to re-add its (nonexistent) events later
from connection_bucket_refill -- if we got to that callback before
we swept the marked connections.

Fixes bug 24167.  Fortunately, this hasn't been a crash bug since we
introduced connection_check_event in 0.2.9.10, and backported it.

This is a bugfix on commit 89d422914a0c3cb, I believe, which
appeared in Tor 0.1.0.1-rc.

8 years agoMinimal implementation of bridge-distribution-request
Nick Mathewson [Tue, 14 Nov 2017 01:44:51 +0000 (20:44 -0500)] 
Minimal implementation of bridge-distribution-request

Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.

This is done in lieu of a full backport of #18329.

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.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 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 '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 '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.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 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 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 agoDon't delay descriptor fetches when missing info needed for circuits
Nick Mathewson [Wed, 8 Nov 2017 18:22:16 +0000 (13:22 -0500)] 
Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.

8 years agoFix DNS resolution on busy exit relays
Sebastian Hahn [Fri, 3 Nov 2017 02:06:12 +0000 (03:06 +0100)] 
Fix DNS resolution on busy exit relays

Thanks to Dhalgren who analyzed this issue two years ago and found a
solution!

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.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.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 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.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.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 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 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 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.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.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.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