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
David Goulet
33da5d7672
test: Initialize the voting schedule in test_dir.c
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-31 14:07:41 -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
Nick Mathewson
b76a161e01
Merge branch 'fix-torrcd-sandbox-22605v2'
2017-10-31 13:58:33 -04:00
Nick Mathewson
1f9764f90d
Merge branch '13605_reduced_exit_squashed'
2017-10-31 13:37:39 -04:00
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
8126ffecb6
Add ChangLog entry for the ReducedExitPolicy option
2017-10-31 13:25:41 -04:00
Neel Chauhan
e8c6d431fa
Modify man page to describe ReducedExitPolicy option
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
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
8b536ca593
Make check-changes happy.
2017-10-31 12:01:58 -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
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
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
04d4786cc4
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
2017-10-31 11:43:07 -04:00
David Goulet
ce99ebf25d
Make tor recalculate voting schedule even if not a dirauth
...
Because the HS subsystem needs the voting schedule to compute time period, we
need all tor type to do that.
Part of #23623
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-31 09:55:24 -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
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
Roger Dingledine
d56b4e598b
fix confusion in man page
...
(I was going to fix "along" to "along with" which was pretty clearly the
original intent, but then I realized that it would be confusing whether
it's only bad when you use several of them in conjunction, or what. So
hopefully this fix is clearer.)
2017-10-30 00:18:40 -04:00
Nick Mathewson
7515eefb70
remove errant ;
2017-10-27 17:58:50 -04:00
Nick Mathewson
afe555aebc
remove changes files from <= 0.3.2
2017-10-27 16:22:09 -04:00
Nick Mathewson
26e0909e51
In the hsdescv3 fuzzer, replace the decryption function.
...
The new decryption function performs no decryption, skips the salt,
and doesn't check the mac. This allows us to fuzz the
hs_descriptor.c code using unencrypted descriptor test, and exercise
more of the code.
Related to 21509.
2017-10-27 14:28:02 -04:00
Nick Mathewson
5e52beceb0
Only prototype rust_welcome_string() when it exists.
2017-10-27 13:03:24 -04:00
Nick Mathewson
69502942b0
[rust] Avoid a clone in contract_protocol_list()
2017-10-27 13:02:14 -04:00
Nick Mathewson
12f58b42a8
Allow test_rust.sh to run from outside the makefile
...
(This is just a matter of making sure that we handle the case where
abs_top_builddir is not set)
2017-10-27 12:54:52 -04:00
Nick Mathewson
6e08807b54
Add a build-rust alias to just rebuild the rust code.
2017-10-27 12:52:07 -04:00
Nick Mathewson
1e66ab363a
[rust] Add "unsafe" to the testing-mode tor_malloc_ wrapper.
...
This change lets us remove the allow(unused_unsafe) directive
from allocate_and_copy_string().
2017-10-27 12:49:51 -04:00
Nick Mathewson
d64297e4e0
forward-port the 0.3.2.3-alpha changelog
2017-10-27 12:36:14 -04:00
Nick Mathewson
3a364529a4
Make distcleancheck pass with --enable-rust
2017-10-27 12:35:13 -04:00
Nick Mathewson
3cf863df1c
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-10-27 12:33:21 -04:00
Nick Mathewson
d5eea977be
bump to 0.3.2.3-alpha-dev.
2017-10-27 12:33:13 -04:00
Nick Mathewson
2153814ba8
Include rust files in 'make dist'
2017-10-27 12:19:31 -04:00
Nick Mathewson
7f764bcba8
repair "make distcheck"
2017-10-27 11:59:15 -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
fa78546dbc
Make sure all C files have copyright/license notices
2017-10-27 10:59:36 -04:00
