Nick Mathewson
7097c4a37a
Merge remote-tracking branch 'dgoulet/bug24053_033_01'
2017-11-06 10:04:22 -05:00
Nick Mathewson
3beb3dac2d
Merge branch 'maint-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
f755f9b9e6
Merge branch 'maint-0.3.2'
2017-11-05 14:41:53 -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
9f650b24e9
Merge branch 'maint-0.3.2'
2017-11-05 14:09:21 -05:00
Alex Xu (Hello71)
a72e13a669
Fix rust welcome message typo.
2017-11-05 13:58:51 -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
cceb43c5e3
Merge branch 'maint-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
65d22dc2f2
Merge branch 'maint-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
f865993653
Merge branch 'maint-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
a46dcc0709
Merge branch 'maint-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
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
a321f8f4af
Merge branch 'buf_for_stringbuffer_squashed'
2017-11-02 10:01:30 -04:00
Nick Mathewson
8993159f3d
Refactor geoip_get_dirreq_history to use buf_t
2017-11-02 10:00:32 -04:00
Nick Mathewson
3b30015143
Refactor connection_write_to_buf_impl_(); add one that takes a buf_t
2017-11-02 10:00:32 -04:00
Nick Mathewson
095e15f8ac
Add a zero-copy buffer move implementation.
2017-11-02 10:00:32 -04:00
Nick Mathewson
5240d02a11
Refactor write_http_response_header_impl() to use buf_t
2017-11-02 10:00:32 -04:00
Nick Mathewson
d5ba4851bd
Add buf_t API helpers for using buffers to construct outputs.
2017-11-02 10:00:32 -04:00
Roger Dingledine
7700b99fe6
easy typos while reviewing commits
2017-11-01 16:44:09 -04:00
Sebastian Hahn
acdd349dee
rename {,TOR_}RUST_DEPENDENCIES
2017-11-01 13:45:15 -04:00
Nick Mathewson
cd606d5ad3
Merge remote-tracking branch 'public/owning_control_fd'
2017-11-01 13:28:31 -04:00
Nick Mathewson
ef25f957e7
Merge branch 'tor_api_squashed'
2017-11-01 13:22:16 -04:00
Nick Mathewson
221f5238ae
tor_runner.c: Add a circumlocution and a caveat.
2017-11-01 13:22:09 -04:00
Nick Mathewson
8c49194505
Add more usage notes on tor_api.h
2017-11-01 13:22:09 -04:00
Nick Mathewson
8b313bd4ad
Explain purpose, usage, and status of tor_runner.c
2017-11-01 13:22:09 -04:00
Nick Mathewson
e8682c8594
Add a small library to emulate tor_run_main() with exec()
2017-11-01 13:22:09 -04:00
Nick Mathewson
fa02ea102e
Add a public tor_api.h with an implementation in tor_api.c
...
The main effect of this change is to commit to an extensible
long-term API.
Closes ticket 23684.
2017-11-01 13:22:09 -04:00
David Goulet
198ede5314
test: Fix SR initialization in routerlist test
...
Fixes #24053
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-01 11:39:52 -04:00
Roger Dingledine
9635843342
trivial comment fixes
...
done while i was trying to debug nearby code
2017-10-31 23:09:00 -04:00
Nick Mathewson
43cbcd3896
Merge branch 'maint-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
f9aed40156
Merge branch 'maint-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
2b6f246652
Merge branch 'maint-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
