Nick Mathewson
d05780c1bb
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-06 10:16:18 -05:00
Nick Mathewson
bebdd91058
Fix a 32-bit formatting warning
2017-11-06 10:16:10 -05:00
Nick Mathewson
8c9b5bfb8c
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-06 09:49:06 -05:00
Nick Mathewson
c80293706f
Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2
2017-11-06 09:48:51 -05:00
Nick Mathewson
6bc1632b72
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-05 14:41:53 -05:00
Nick Mathewson
f46cdb3ff8
lintchanges: Allow 'fixes bugs a, b, and c'
2017-11-05 14:41:39 -05:00
Nick Mathewson
9f3d9c68ab
Merge branch 'bug21394_029' into maint-0.3.2
2017-11-05 14:39:37 -05:00
Sebastian Hahn
9827574308
Fix DNS resolution on busy exit relays
...
Thanks to Dhalgren who analyzed this issue two years ago and found a
solution!
2017-11-05 14:36:32 -05:00
Nick Mathewson
ed10b34efe
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-05 14:09:21 -05:00
Nick Mathewson
7c1f33dd0e
ticket21031 changes file revised.
2017-11-05 14:09:07 -05:00
Sebastian Hahn
d3fee8b823
ClientDNSRejectInternalAddresses in non-default networks
...
Once again allow the flag to be set, unless the default network is used.
Thanks to nickm for a suggestion for the workaround to a test failure.
2017-11-04 18:31:02 +01:00
Sebastian Hahn
e491c05f96
Undo deprecation of ClientDNSRejectInternalAddresses
2017-11-04 18:31:00 +01:00
Sebastian Hahn
5a46074e55
Revert "Make ClientDNSRejectInternalAddresses testing-only."
...
This reverts commit 27fa4a98d2
2017-11-04 18:30:59 +01:00
Nick Mathewson
3d966f57a4
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-02 10:34:08 -04:00
David Goulet
0386280487
nodelist: Downgrade warning to protocol warning
...
The node_get_ed25519_id() warning can actually be triggered by a relay flagged
with NoEdConsensus so instead of triggering a warning on all relays of the
network, downgrade it to protocol warning.
Fixes #24025
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-02 10:33:57 -04:00
Nick Mathewson
6688091928
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-02 10:32:18 -04:00
Nick Mathewson
cb42c62c9e
Merge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2
2017-11-02 10:30:42 -04:00
David Goulet
6dc591a024
sched: Rate limit scheduler_bug_occurred()
...
Just in case we end up hitting a SCHED_BUG() multiple times, rate limit the
log warning.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-02 10:30:33 -04:00
Matt Traudt
52050bb2c6
sched: Add another SCHED_BUG() callsite
2017-11-02 10:30:33 -04:00
David Goulet
3931a6f264
sched: Use SCHED_BUG() macro in scheduler
...
When a BUG() occurs, this macro will print extra information about the state
of the scheduler and the given channel if any. This will help us greatly to
fix future bugs in the scheduler especially when they occur rarely.
Fixes #23753
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-02 10:30:33 -04:00
Nick Mathewson
33652fce62
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-02 10:26:30 -04:00
teor
27ea6fcd31
Test that IPv6-only clients can use microdescriptors
...
When running "make test-network-all", test that IPv6-only clients can use
microdescriptors. IPv6-only microdescriptor client support was fixed in
tor 0.3.0.1-alpha.
Requires chutney master 61c28b9 or later.
Closes ticket 24109.
2017-11-02 10:25:49 -04:00
Nick Mathewson
aed642a4b2
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-02 10:22:35 -04:00
Nick Mathewson
6a9a118f90
Tweak a comment for a minor but important distinction
2017-11-02 10:22:32 -04:00
Nick Mathewson
3aab8307a5
Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2
2017-11-02 10:19:29 -04:00
teor
a2bc979d9d
Changes file for 23820
2017-11-02 10:19:05 -04:00
teor
176bfe1bed
Don't run IPv6-only v3 single onion service tests using chutney
...
Part of #23820 .
2017-11-02 10:19:05 -04:00
teor
cc072b6fbf
Stop users configuring IPv6-only v3 single onion services
...
They are not yet implemented: they will upload descriptors, but won't be
able to rendezvous, because IPv6 addresses in link specifiers are ignored.
Part of #23820 .
2017-11-02 10:19:05 -04:00
teor
a4f34c1106
Improve v3 onion service logging for intro and rend points
...
Diagnostics for #23820 .
2017-11-02 10:19:05 -04:00
teor
77ed99b1a7
Remove buggy IPv6 and ed25519 handling from get_lspecs_from_extend_info()
...
The previous version of this function had the following issues:
* it didn't check if the extend_info contained an IPv6 address,
* it didn't check if the ed25519 identity key was valid.
But we can't add IPv6 support in a bugfix release.
Instead, BUG() if the address is an IPv6 address, so we always put IPv4
addresses in link specifiers. And ignore missing ed25519 identifiers,
rather than generating an all-zero link specifier.
This supports v3 hidden services on IPv4, dual-stack, and IPv6, and
v3 single onion services on IPv4 only.
Part of 23820, bugfix on 0.3.2.1-alpha.
2017-11-02 10:19:05 -04:00
Nick Mathewson
588be5b028
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-01 13:50:06 -04:00
David Goulet
8687d9cf44
man: Specify HiddenServiceNumIntroductionPoints for v3
...
A v3 service can have between 0 and 20 intro points where v2 has 0 to 10.
Fixes #24115
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-01 13:50:04 -04:00
Nick Mathewson
8a8b5d590e
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-31 14:31:55 -04:00
Nick Mathewson
0627512368
Merge branch 'bug24082_032' into maint-0.3.2
2017-10-31 14:31:21 -04:00
Nick Mathewson
0f47507fe2
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-31 14:18:52 -04:00
Nick Mathewson
c3ea1ccf04
double newline
2017-10-31 14:18:48 -04:00
Nick Mathewson
c5bb554e77
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-31 14:04:34 -04:00
Nick Mathewson
8dffc46748
Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2
2017-10-31 14:04:31 -04:00
Nick Mathewson
68181dc263
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-31 12:19:42 -04:00
Nick Mathewson
652d22e608
make 23762 changes file pass check-changes
2017-10-31 12:19:39 -04:00
Nick Mathewson
3d93ec3ef4
Merge branch 'bug23762_032_02_squashed' into maint-0.3.2
2017-10-31 12:14:21 -04:00
David Goulet
5dbcd48f0e
hs-v3: Attempt descriptor refetch when dirinfo changes
...
When the directory information changes, callback to the HS client subsystem so
it can check if any pending SOCKS connections are waiting for a descriptor. If
yes, attempt a refetch for those.
Fixes #23762
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-31 12:14:11 -04:00
Nick Mathewson
a99ca9313a
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-31 11:43:14 -04:00
Nick Mathewson
7c59c751b0
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-31 11:43:14 -04:00
Nick Mathewson
5a21b27083
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-31 11:43:14 -04:00
Nick Mathewson
f2e23d38ab
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-31 11:43:14 -04:00
Nick Mathewson
04d4786cc4
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
2017-10-31 11:43:07 -04:00
Nick Mathewson
5dce134fbb
Initialize the mock options in the fuzzing code
...
Fixes bug 24082; bugfix on 0.3.0.3-alpha. Found by Brian Carpenter.
2017-10-30 17:05:26 -04:00
Nick Mathewson
dbd4b2be5d
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-30 11:07:44 -04:00
Nick Mathewson
5bee5fbac7
Merge remote-tracking branch 'public/bug23774_032' into maint-0.3.2
2017-10-30 11:07:26 -04:00
