]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMerge remote-tracking branch 'teor/bug23760_nc'
Nick Mathewson [Tue, 21 Nov 2017 18:56:57 +0000 (13:56 -0500)] 
Merge remote-tracking branch 'teor/bug23760_nc'

8 years agochanges file for 24318
Nick Mathewson [Tue, 21 Nov 2017 18:55:11 +0000 (13:55 -0500)] 
changes file for 24318

8 years agoClarify the RelayBandwidth* options in man file
Fernando Fernandez Mancera [Mon, 20 Nov 2017 16:13:16 +0000 (17:13 +0100)] 
Clarify the RelayBandwidth* options in man file

Added clarifying information in man file about RelayBandwidthRate and
RelayBandwidthBurst options that exclude directory fetches by relays.

Fixes #24318

Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
8 years agoRemove /usr/athena from search path in configure.ac
Fernando Fernandez Mancera [Tue, 21 Nov 2017 15:53:37 +0000 (16:53 +0100)] 
Remove /usr/athena from search path in configure.ac

Fixes #24363

Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 21 Nov 2017 17:54:26 +0000 (12:54 -0500)] 
Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

8 years agobump version to 0.3.2.5-alpha
Nick Mathewson [Tue, 21 Nov 2017 17:54:11 +0000 (12:54 -0500)] 
bump version to 0.3.2.5-alpha

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 21 Nov 2017 17:41:39 +0000 (12:41 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2
Nick Mathewson [Tue, 21 Nov 2017 17:37:46 +0000 (12:37 -0500)] 
Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2

8 years agoadd an explanatory comment about the error codes
Nick Mathewson [Tue, 21 Nov 2017 17:36:32 +0000 (12:36 -0500)] 
add an explanatory comment about the error codes

8 years agoIntroduce node_get_curve25519_onion_key() in extend_info_from_node()
Neel Chauhan [Tue, 21 Nov 2017 14:16:18 +0000 (09:16 -0500)] 
Introduce node_get_curve25519_onion_key() in extend_info_from_node()

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 20 Nov 2017 19:35:26 +0000 (14:35 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug23817_031' into maint-0.3.2
Nick Mathewson [Mon, 20 Nov 2017 19:29:50 +0000 (14:29 -0500)] 
Merge branch 'bug23817_031' into maint-0.3.2

8 years agoCheck number of usable guards when applying md restrictions.
George Kadianakis [Mon, 20 Nov 2017 16:11:59 +0000 (18:11 +0200)] 
Check number of usable guards when applying md restrictions.

We used to check whether we have enough filtered guards (guard set when
torrc is applied) but that's not good enough, since that might be bad in
some cases where many guards are not reachable (might cause overblocking
and hence reacahbility issues).

We now check if we have enough reachable filtered guards before applying
md restrictions which should prevent overblocking.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 20 Nov 2017 19:25:17 +0000 (14:25 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug23783' into maint-0.3.2
Nick Mathewson [Mon, 20 Nov 2017 19:25:12 +0000 (14:25 -0500)] 
Merge branch 'bug23783' into maint-0.3.2

8 years agoInclude ws2_32 when trying to link openssl on windows in autoconf
Nick Mathewson [Mon, 20 Nov 2017 18:37:22 +0000 (13:37 -0500)] 
Include ws2_32 when trying to link openssl on windows in autoconf

Fixes bug 23783; bugfix on 0.3.2.2-alpha when we started looking for
TLSv1_1_method().

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 20 Nov 2017 18:22:10 +0000 (13:22 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branches 'public/ticket24315_029' and 'public/bug24198_029...
Nick Mathewson [Mon, 20 Nov 2017 18:20:25 +0000 (13:20 -0500)] 
Merge remote-tracking branches 'public/ticket24315_029' and 'public/bug24198_029' into maint-0.3.2

8 years agoAdd another assertion to check for 24086 root causes
Nick Mathewson [Mon, 20 Nov 2017 16:04:44 +0000 (11:04 -0500)] 
Add another assertion to check for 24086 root causes

In cdm_diff_ht_set_status(), we shouldn't have been allowing the
status CDM_DIFF_PRESENT to be set if there wasn't actually a handle.

8 years agoCorrectly handle partial success in consensus diff calculation.
Nick Mathewson [Mon, 20 Nov 2017 16:02:40 +0000 (11:02 -0500)] 
Correctly handle partial success in consensus diff calculation.

Previously, if store_multiple() reported a partial success, we would
store all the handles it gave us as if they had succeeded.  But it's
possible for the diff to be only partially successful -- for
example, if LZMA failed but the other compressors succeeded.

Fixes bug 24086; bugfix on 0.3.1.1-alpha.

8 years agoRecover better from empty/invalid storagedir files
Nick Mathewson [Mon, 20 Nov 2017 15:14:41 +0000 (10:14 -0500)] 
Recover better from empty/invalid storagedir files

If we can't read a file because of an FS issue, we say "we can't
read that" and move on.  But if we can't read it because it's empty,
because it has no labels, or because its labels are misformatted, we
should remove it.

Fixes bug 24099; bugfix on 0.3.1.1-alpha.

8 years agoIn storagedir, take more care with errno on empty or mislabeled file
Nick Mathewson [Mon, 20 Nov 2017 15:10:13 +0000 (10:10 -0500)] 
In storagedir, take more care with errno on empty or mislabeled file

Required for 24099 fix -- we won't be able to act based on errno
unless we can trust it.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 20 Nov 2017 13:39:39 +0000 (08:39 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug23681_029_01_squashed' into maint-0.3.2
Nick Mathewson [Mon, 20 Nov 2017 13:39:34 +0000 (08:39 -0500)] 
Merge branch 'bug23681_029_01_squashed' into maint-0.3.2

8 years agocircuit: Don't timeout opened C_INTRODUCING circuit
David Goulet [Tue, 14 Nov 2017 14:01:21 +0000 (09:01 -0500)] 
circuit: Don't timeout opened C_INTRODUCING circuit

A circuit with purpose C_INTRODUCING means that its state is opened but the
INTRODUCE1 cell hasn't been sent yet. We shouldn't consider that circuit when
looking for timing out "building circuit". We have to wait on the rendezvous
circuit to be opened before sending that cell so the intro circuit needs to be
kept alive for at least that period of time.

This patch makes that the purpose C_INTRODUCING is ignored in the
circuit_expire_building() which means that we let the circuit idle timeout
take care of it if we end up never using it.

Fixes #23681

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoRemove changes files that have already been merged in 0.3.2.x
Nick Mathewson [Sat, 18 Nov 2017 16:23:41 +0000 (11:23 -0500)] 
Remove changes files that have already been merged in 0.3.2.x

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Sat, 18 Nov 2017 16:03:16 +0000 (11:03 -0500)] 
Merge branch 'maint-0.3.2'

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

"Ours" merge to avoid taking ticket18329_minimal_025

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Sat, 18 Nov 2017 16:02:42 +0000 (11:02 -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 [Sat, 18 Nov 2017 16:02:08 +0000 (11:02 -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, 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 agoMove an assertion to make scan-build happy again.
Nick Mathewson [Sat, 18 Nov 2017 15:51:23 +0000 (10:51 -0500)] 
Move an assertion to make scan-build happy again.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Sat, 18 Nov 2017 15:27:29 +0000 (10:27 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoAdd an extra check in test_entrynodes
Nick Mathewson [Sat, 18 Nov 2017 15:26:45 +0000 (10:26 -0500)] 
Add an extra check in test_entrynodes

This check makes it so we can reach "done" without setting "conn",
and so the "if (conn)" check will not be redundant, and so coverity
won't complain.  Fixes CID 1422205.  Not actually a bug.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Sat, 18 Nov 2017 15:23:52 +0000 (10:23 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoFix memory leak in unit test for bridge distribution config.
Nick Mathewson [Sat, 18 Nov 2017 02:19:18 +0000 (21:19 -0500)] 
Fix memory leak in unit test for bridge distribution config.

Also, check for the actual message, and fix some string confusion,
while we're at it.

Fixes bug 24345; bugfix on 0.3.2.3-alpha.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 17 Nov 2017 14:59:26 +0000 (09:59 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug23817_tests_032' into maint-0.3.2
Nick Mathewson [Fri, 17 Nov 2017 14:58:12 +0000 (09:58 -0500)] 
Merge branch 'bug23817_tests_032' into maint-0.3.2

8 years agoFix a clang unitialized-var warning
Nick Mathewson [Wed, 8 Nov 2017 00:40:52 +0000 (19:40 -0500)] 
Fix a clang unitialized-var warning

8 years agoIntoduce unittest for skipping outdated dirservers.
George Kadianakis [Mon, 6 Nov 2017 13:45:42 +0000 (15:45 +0200)] 
Intoduce unittest for skipping outdated dirservers.

8 years agoFix a wide comment
Nick Mathewson [Fri, 17 Nov 2017 14:57:15 +0000 (09:57 -0500)] 
Fix a wide comment

8 years agoMerge branch 'bug23817_031' into maint-0.3.2
Nick Mathewson [Fri, 17 Nov 2017 14:56:53 +0000 (09:56 -0500)] 
Merge branch 'bug23817_031' into maint-0.3.2

8 years agoMake should_set_md_dirserver_restriction() look at num filtered guards
Nick Mathewson [Thu, 16 Nov 2017 13:49:24 +0000 (08:49 -0500)] 
Make should_set_md_dirserver_restriction() look at num filtered guards

This seems closer to what the code intended.

8 years agoSkip dirserver restrictions in small networks.
George Kadianakis [Mon, 13 Nov 2017 20:26:22 +0000 (22:26 +0200)] 
Skip dirserver restrictions in small networks.

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.2'
Nick Mathewson [Fri, 17 Nov 2017 14:26:11 +0000 (09:26 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoOnly log about lost KIST support once
Matt Traudt [Thu, 16 Nov 2017 19:38:39 +0000 (14:38 -0500)] 
Only log about lost KIST support once

8 years agoUse less jargon in Scheduler sec. of man page
Matt Traudt [Thu, 16 Nov 2017 19:32:17 +0000 (14:32 -0500)] 
Use less jargon in Scheduler sec. of man page

8 years agoAdd notes about OS support for our scheduler types
Matt Traudt [Thu, 16 Nov 2017 14:21:12 +0000 (09:21 -0500)] 
Add notes about OS support for our scheduler types

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 17 Nov 2017 14:23:07 +0000 (09:23 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2
Nick Mathewson [Fri, 17 Nov 2017 14:23:04 +0000 (09:23 -0500)] 
Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2

8 years agoAdd error message for exit_node in hs_circ_send_introduce1()
Neel Chauhan [Thu, 16 Nov 2017 18:13:31 +0000 (13:13 -0500)] 
Add error message for exit_node in hs_circ_send_introduce1()

8 years agoUse memset() on intro1_data in hs_circ_send_introduce1()
Neel Chauhan [Thu, 16 Nov 2017 17:58:37 +0000 (12:58 -0500)] 
Use memset() on intro1_data in hs_circ_send_introduce1()

8 years agoAdd smartlist_add() to get_lspecs_from_node)
Neel Chauhan [Thu, 16 Nov 2017 17:37:39 +0000 (12:37 -0500)] 
Add smartlist_add() to get_lspecs_from_node)

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 17 Nov 2017 13:35:56 +0000 (08:35 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug24167_025' into maint-0.3.2
Nick Mathewson [Fri, 17 Nov 2017 13:35:52 +0000 (08:35 -0500)] 
Merge branch 'bug24167_025' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 17 Nov 2017 13:35:04 +0000 (08:35 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'ticket24097_032' into maint-0.3.2
Nick Mathewson [Fri, 17 Nov 2017 13:35:01 +0000 (08:35 -0500)] 
Merge branch 'ticket24097_032' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 17 Nov 2017 13:34:23 +0000 (08:34 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug20963_032' into maint-0.3.2
Nick Mathewson [Fri, 17 Nov 2017 13:34:05 +0000 (08:34 -0500)] 
Merge branch 'bug20963_032' into maint-0.3.2

8 years agoAdd a changes file.
Nick Mathewson [Thu, 16 Nov 2017 19:07:58 +0000 (14:07 -0500)] 
Add a changes file.

8 years agoCheck the libc version to decide whether to allow openat.
Nick Mathewson [Thu, 16 Nov 2017 19:06:38 +0000 (14:06 -0500)] 
Check the libc version to decide whether to allow openat.

8 years agoMake our seccomp2 sandbox handle Glibc 2.26
Nick Mathewson [Thu, 16 Nov 2017 18:53:48 +0000 (13:53 -0500)] 
Make our seccomp2 sandbox handle Glibc 2.26

There are three changes here:
  * We need to allow epoll_pwait.
  * We need to allow PF_NETLINK sockets to be opened with SOCK_CLOEXEC.
  * We need to use openat() instead of open().

Note that this fix is not complete, since the openat() change is
turned off.  The next commit will make the openat() change happen
when we're running glibc 2.26 or later.

Fix for 24315.

8 years agoPermit kill(pid, 0) in the seccomp2 sandbox.
Nick Mathewson [Thu, 16 Nov 2017 17:44:47 +0000 (12:44 -0500)] 
Permit kill(pid, 0) in the seccomp2 sandbox.

We don't want to allow general signals to be sent, but there's no
problem sending a kill(0) to probe whether a process is there.

Fixes bug 24198; bugfix on 0.2.5.1-alpha when the seccomp2 sandbox
was introduced.

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 agorelay: Avoid extra LOG_NOTICE for every new descriptor batch
David Goulet [Thu, 16 Nov 2017 15:51:41 +0000 (10:51 -0500)] 
relay: Avoid extra LOG_NOTICE for every new descriptor batch

Commit 56c5e282a733912776f6dacbe4f5df66b4fb9606 suppressed that same log
statement in directory_info_has_arrived() for microdescriptors so do the same
for the descriptors. As the commit says, we already have the bootstrap
progress for this.

Fixes #23861

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoDowngrade evdns warnings about weird replies.
Nick Mathewson [Thu, 16 Nov 2017 14:30:19 +0000 (09:30 -0500)] 
Downgrade evdns warnings about weird replies.

evdns is allowed to give us unrecognized object types; it is allowed
to give us non-IPv4 answer types, and it is (even) allowed to give
us empty answers without an error.

Closes ticket 24097.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 15 Nov 2017 20:11:30 +0000 (15:11 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug24279_030' into maint-0.3.2
Nick Mathewson [Wed, 15 Nov 2017 20:11:26 +0000 (15:11 -0500)] 
Merge branch 'bug24279_030' into maint-0.3.2

8 years agowhoops; add missing credit.
Nick Mathewson [Wed, 15 Nov 2017 20:11:15 +0000 (15:11 -0500)] 
whoops; add missing credit.

8 years agoMerge branch 'bug24279_030' into maint-0.3.2
Nick Mathewson [Wed, 15 Nov 2017 20:09:33 +0000 (15:09 -0500)] 
Merge branch 'bug24279_030' into maint-0.3.2

8 years agoChanges file for 24279.
Nick Mathewson [Wed, 15 Nov 2017 20:09:11 +0000 (15:09 -0500)] 
Changes file for 24279.

8 years agoFix configure libevent memory leak
Alex Xu (Hello71) [Sun, 29 Oct 2017 13:14:58 +0000 (13:14 +0000)] 
Fix configure libevent memory leak

Breaks build with externally-specified hardening flags.

8 years agoTweak the message when we re-enable CBT.
Nick Mathewson [Wed, 15 Nov 2017 19:42:59 +0000 (14:42 -0500)] 
Tweak the message when we re-enable CBT.

Implements ticket 20963.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 15 Nov 2017 19:25:25 +0000 (14:25 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
Nick Mathewson [Wed, 15 Nov 2017 19:25:20 +0000 (14:25 -0500)] 
Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2

8 years agoRemove remove_file_if_very_old() -- nothing calls it.
Nick Mathewson [Tue, 14 Nov 2017 20:33:58 +0000 (15:33 -0500)] 
Remove remove_file_if_very_old() -- nothing calls it.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 14 Nov 2017 19:45:11 +0000 (14:45 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2
Nick Mathewson [Tue, 14 Nov 2017 19:45:07 +0000 (14:45 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2

8 years agoSilence a warning about failed descriptor uploads.
George Kadianakis [Tue, 14 Nov 2017 15:16:33 +0000 (17:16 +0200)] 
Silence a warning about failed descriptor uploads.

Due to #23662 this can happen under natural causes and does not disturb
the functionality of the service. This is a simple 0.3.2 fix for now,
and we plan to fix this properly in 0.3.3.

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 '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 'maint-0.3.2'
Nick Mathewson [Tue, 14 Nov 2017 01:36:04 +0000 (20:36 -0500)] 
Merge branch 'maint-0.3.2'

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

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.2'
Nick Mathewson [Mon, 13 Nov 2017 21:58:21 +0000 (16:58 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoadd a missing subcategory to 23637, again
Nick Mathewson [Mon, 13 Nov 2017 21:58:11 +0000 (16:58 -0500)] 
add a missing subcategory to 23637, again

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 'maint-0.3.2'
Nick Mathewson [Mon, 13 Nov 2017 17:57:58 +0000 (12:57 -0500)] 
Merge branch 'maint-0.3.2'

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

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 branch 'maint-0.3.2'
Nick Mathewson [Mon, 13 Nov 2017 17:27:44 +0000 (12:27 -0500)] 
Merge branch 'maint-0.3.2'

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

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>