Nick Mathewson
cd606d5ad3
Merge remote-tracking branch 'public/owning_control_fd'
2017-11-01 13:28:31 -04:00
Nick Mathewson
e79d74072b
missing changes file for 22605
2017-11-01 13:27:57 -04:00
Nick Mathewson
ef25f957e7
Merge branch 'tor_api_squashed'
2017-11-01 13:22:16 -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
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
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
Neel Chauhan
8126ffecb6
Add ChangLog entry for the ReducedExitPolicy option
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
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
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
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
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
Nick Mathewson
91a1b9058b
Add a changes file
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
Nick Mathewson
4af1653e0f
Merge branch 'maint-0.3.2'
2017-10-26 10:43:05 -04:00
David Goulet
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
Nick Mathewson
636d0ad68b
remove now-redundant changes file
2017-10-26 09:09:37 -04:00
Nick Mathewson
e4f02f6c18
Merge remote-tracking branch 'asn/bug23862_v2'
2017-10-26 09:09:14 -04:00
Nick Mathewson
78222831a0
Merge branch 'maint-0.3.2'
2017-10-26 09:08:52 -04:00
Nick Mathewson
62cd64cc16
fix check-changes warning
2017-10-26 09:08:49 -04:00
Nick Mathewson
be49fadad0
Merge branch 'maint-0.3.2'
2017-10-26 09:03:21 -04:00
George Kadianakis
e0276dc1c6
Add changes file for #23862 .
2017-10-26 13:36:04 +03:00
George Kadianakis
1a6814c096
Fix offending unittest and add changes file for #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
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
b95ef19a77
Merge branch 'feature18329_029_squashed' into maint-0.3.2
2017-10-24 19:35:32 -04:00
Nick Mathewson
594cf92498
Merge branch 'feature18329_029_squashed' into maint-0.3.2
2017-10-24 19:35:28 -04:00
Nick Mathewson
f3af74ccf5
Updates to fix check-spaces/check-changes warnings
2017-10-24 19:35:16 -04:00
Nick Mathewson
3581f93d27
Tweak the documentation for BridgeDistribution
...
Note that it will have no effect yet; note that the default is
"any".
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
