65d22dc2f2
Merge branch 'maint-0.3.2'
2017-11-02 10:32:18 -04:00
cb42c62c9e
Merge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2
2017-11-02 10:30:42 -04:00
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
f865993653
Merge branch 'maint-0.3.2'
2017-11-02 10:26:30 -04:00
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
a46dcc0709
Merge branch 'maint-0.3.2'
2017-11-02 10:22:35 -04:00
3aab8307a5
Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2
2017-11-02 10:19:29 -04:00
a2bc979d9d
Changes file for 23820
2017-11-02 10:19:05 -04:00
a321f8f4af
Merge branch 'buf_for_stringbuffer_squashed'
2017-11-02 10:01:30 -04:00
508645b5a4
changes file for 22342
2017-11-02 10:00:32 -04:00
affaaa1968
Merge branch 'maint-0.3.2'
2017-11-01 13:50:06 -04:00
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
cd606d5ad3
Merge remote-tracking branch 'public/owning_control_fd'
2017-11-01 13:28:31 -04:00
e79d74072b
missing changes file for 22605
2017-11-01 13:27:57 -04:00
ef25f957e7
Merge branch 'tor_api_squashed'
2017-11-01 13:22:16 -04:00
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
43cbcd3896
Merge branch 'maint-0.3.2'
2017-10-31 14:31:55 -04:00
0627512368
Merge branch 'bug24082_032' into maint-0.3.2
2017-10-31 14:31:21 -04:00
2b6f246652
Merge branch 'maint-0.3.2'
2017-10-31 14:04:34 -04:00
8dffc46748
Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2
2017-10-31 14:04:31 -04:00
8126ffecb6
Add ChangLog entry for the ReducedExitPolicy option
2017-10-31 13:25:41 -04:00
4700ba6c3d
Merge branch 'maint-0.3.2'
2017-10-31 12:19:42 -04:00
652d22e608
make 23762 changes file pass check-changes
2017-10-31 12:19:39 -04:00
3d93ec3ef4
Merge branch 'bug23762_032_02_squashed' into maint-0.3.2
2017-10-31 12:14:21 -04:00
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
8b536ca593
Make check-changes happy.
2017-10-31 12:01:58 -04:00
c9ad172dd4
Merge branch 'bug23571_033_squashed'
2017-10-31 11:59:18 -04:00
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
7c59c751b0
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-10-31 11:43:14 -04:00
cf98ca715c
Merge branch 'maint-0.3.2'
2017-10-31 11:43:14 -04:00
5a21b27083
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-31 11:43:14 -04:00
f2e23d38ab
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-31 11:43:14 -04:00
04d4786cc4
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
2017-10-31 11:43:07 -04:00
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
332d6bf901
Merge branch 'maint-0.3.2'
2017-10-30 11:07:44 -04:00
5bee5fbac7
Merge remote-tracking branch 'public/bug23774_032' into maint-0.3.2
2017-10-30 11:07:26 -04:00
afe555aebc
remove changes files from <= 0.3.2
2017-10-27 16:22:09 -04:00
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
30a681553f
Merge remote-tracking branch 'public/exit_carefully'
2017-10-27 11:13:05 -04:00
f5e9e2748f
Merge branch 'protover-rust-impl_squashed'
2017-10-27 10:05:30 -04:00
91a1b9058b
Add a changes file
2017-10-27 10:02:08 -04:00
a0f8c01004
Merge branch 'maint-0.3.2'
2017-10-27 08:05:04 -04:00
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
4af1653e0f
Merge branch 'maint-0.3.2'
2017-10-26 10:43:05 -04:00
c4ef21ff5e
fuzzing: Make hsdescv3 use the decoding API correctly
...
Fixes #21509
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-10-26 09:52:15 -04:00
636d0ad68b
remove now-redundant changes file
2017-10-26 09:09:37 -04:00
e4f02f6c18
Merge remote-tracking branch 'asn/bug23862_v2'
2017-10-26 09:09:14 -04:00
78222831a0
Merge branch 'maint-0.3.2'
2017-10-26 09:08:52 -04:00
62cd64cc16
fix check-changes warning
2017-10-26 09:08:49 -04:00
be49fadad0
Merge branch 'maint-0.3.2'
2017-10-26 09:03:21 -04:00
Nick Mathewson
David Goulet
teor
Neel Chauhan