Nick Mathewson
00e781142b
Don't give "exitrelay may become 0 when no policy" warning on ReducedExitPolicy
2017-10-31 13:25:41 -04:00
Nick Mathewson
6e2f8de62d
Fix: when BridgeRelay is set, you do not get any exit policy.
2017-10-31 13:25:41 -04:00
Neel Chauhan
b70e11ef6b
Add code for letting user select Reduced Exit Policy
2017-10-31 13:25:41 -04:00
Nick Mathewson
4700ba6c3d
Merge branch 'maint-0.3.2'
2017-10-31 12:19:42 -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
c9ad172dd4
Merge branch 'bug23571_033_squashed'
2017-10-31 11:59:18 -04:00
teor
e9f57e193d
Consistently use braced blocks in hibernate_go_dormant()
2017-10-31 11:58:34 -04:00
teor
e57604183c
When hibernating, close connections normally and allow them to flush
...
Bugfix on 7267 in 0.2.4.7-alpha
2017-10-31 11:58:34 -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
cf98ca715c
Merge branch '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
332d6bf901
Merge branch 'maint-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
Nick Mathewson
7515eefb70
remove errant ;
2017-10-27 17:58:50 -04:00
Nick Mathewson
5e52beceb0
Only prototype rust_welcome_string() when it exists.
2017-10-27 13:03:24 -04:00
Nick Mathewson
f803c1bb17
declare shutdown_did_not_work_callback() with ATTR_NORETURN
2017-10-27 11:51:42 -04:00
Nick Mathewson
79e7c0af0e
Add a comment about removing the failsafe event loop exit code
2017-10-27 11:15:43 -04:00
Nick Mathewson
0a10335d2e
Clarify doc on tell_event_loop_to_run_external_code()
2017-10-27 11:14:37 -04:00
Nick Mathewson
30a681553f
Merge remote-tracking branch 'public/exit_carefully'
2017-10-27 11:13:05 -04:00
Nick Mathewson
f5e9e2748f
Merge branch 'protover-rust-impl_squashed'
2017-10-27 10:05:30 -04:00
Chelsea Holland Komlo
91bca5c31b
move to allocating c strings from rust
2017-10-27 10:02:08 -04:00
Chelsea Holland Komlo
be583a34a3
use tor allocator for string allocation in rust
2017-10-27 10:02:08 -04:00
Chelsea Holland Komlo
0c04b54d4d
minimize scope for unsafe
...
update documentation
missing check for null
2017-10-27 10:02:08 -04:00
Chelsea Holland Komlo
d1820c1516
rust implementation of protover
2017-10-27 10:02:08 -04:00
Nick Mathewson
a0f8c01004
Merge branch 'maint-0.3.2'
2017-10-27 08:05:04 -04:00
David Goulet
e598c6f6de
hs-v3: Check the ed25519 key when picking intro point
...
If the intro point supports ed25519 link authentication, make sure we don't
have a zeroed key which would lead to a failure to extend to it.
We already check for an empty key if the intro point does not support it so
this makes the check on the key more consistent and symmetric.
Fixes #24002
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-26 14:54:20 -04:00
George Kadianakis
42a47c0e7d
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.
2017-10-26 13:36:04 +03:00
George Kadianakis
cbc70437a7
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
2017-10-26 13:36:04 +03:00
George Kadianakis
dfd3ed5bdc
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.
2017-10-25 20:22:52 +03:00
George Kadianakis
10c5eae3fa
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
2017-10-25 20:22:52 +03:00
George Kadianakis
8c8d3b90f7
Add a unittest that reveals the offending case of #23862 .
2017-10-25 20:22:52 +03:00
Nick Mathewson
c7a1a987d6
Merge branch 'maint-0.3.2'
2017-10-25 12:25:41 -04:00
David Goulet
9592797cf3
hs-v2: Copy needed information between service on prunning
...
Turns out that when reloading a tor configured with hidden service(s), we
weren't copying all the needed information between the old service object to
the new one.
For instance, the desc_is_dirty timestamp wasn't which could lead to the
service uploading its desriptor much later than it would need to.
The replaycache wasn't also moved over and some intro point information as
well.
Fixes #23790
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-25 11:21:28 -04:00
Nick Mathewson
e5c341eb7c
Merge branch 'maint-0.3.2'
2017-10-24 19:43:13 -04:00
Nick Mathewson
3498183807
Turn a comment into a doxygen comment.
...
Crediting this * to teor, in penance for mis-crediting his x removal
to Isis. The balance is restored.
2017-10-24 19:42:18 -04:00
Nick Mathewson
e7126a1030
Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2
2017-10-24 19:41:26 -04:00
Nick Mathewson
8d908b961f
Merge branch 'maint-0.3.2'
2017-10-24 19:37:11 -04:00
Nick Mathewson
8cc57bccfe
Isis has been noticing typos.
2017-10-24 19:37:09 -04:00
Nick Mathewson
594cf92498
Merge branch 'feature18329_029_squashed' into maint-0.3.2
2017-10-24 19:35:28 -04:00
Isis Lovecruft
02cde0d939
test: Add unittest for descriptors with BridgeDistribution option.
2017-10-24 19:26:24 -04:00
Isis Lovecruft
b0e10f23ba
doc: Improve documentation for check_bridge_distribution_setting().
2017-10-24 19:26:24 -04:00
Nick Mathewson
613b18f0af
Always set bridge-distribution-request on bridges' descriptors.
...
Also, warn the user if the BridgeDistribution option is
unrecognized, and reject the value if it is invalid.
2017-10-24 19:26:24 -04:00
Roger Dingledine
ebab521525
Add new BridgeDistribution config option
...
Bridge relays can use it to add a "bridge-distribution-request" line
to their bridge descriptor, which tells BridgeDB how they'd like their
bridge address to be given out.
Implements tickets 18329.
2017-10-24 19:26:24 -04:00
Taylor Yu
9b60acd4d4
Rewrite bridge addresses earlier
...
Call rewrite_node_address_for_bridge() in
launch_direct_bridge_descriptor_fetch() in case there's an existing
node_t for it.
2017-10-24 17:35:17 -05:00
Nick Mathewson
649000662d
Merge remote-tracking branch 'arma/ticket23637'
2017-10-24 12:52:41 -04:00
Nick Mathewson
abbd6a36fc
Merge branch 'maint-0.3.2'
2017-10-24 08:25:29 -04:00
Nick Mathewson
0d4addfc73
Merge branch 'bug23952_032' into maint-0.3.2
2017-10-24 08:24:12 -04:00