Nick Mathewson
588be5b028
Merge branch 'maint-0.3.2' into release-0.3.2
2017-11-01 13:50:06 -04:00
David Goulet
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
Nick Mathewson
8a8b5d590e
Merge branch 'maint-0.3.2' into release-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
0f47507fe2
Merge branch 'maint-0.3.2' into release-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
c5bb554e77
Merge branch 'maint-0.3.2' into release-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
68181dc263
Merge branch 'maint-0.3.2' into release-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
a99ca9313a
Merge branch 'maint-0.3.2' into release-0.3.2
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
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
dbd4b2be5d
Merge branch 'maint-0.3.2' into release-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
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
080bcfa239
Merge branch 'maint-0.3.2' into release-0.3.2
2017-10-27 12:33:34 -04:00
Nick Mathewson
d5eea977be
bump to 0.3.2.3-alpha-dev.
2017-10-27 12:33:13 -04:00
Nick Mathewson
023d756bfc
changelog fix; thanks dgoulet
2017-10-27 11:20:44 -04:00
Nick Mathewson
325549d2e7
finish the blurb, pick a date, tighten prose
2017-10-27 09:12:32 -04:00
Nick Mathewson
5a65695149
start a changelog for 0.3.2.3-alpha
2017-10-27 09:04:41 -04:00
Nick Mathewson
fb88527195
update to 0.3.2.3-alpha
2017-10-27 08:59:07 -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
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
David Goulet
4d2de821ce
Revert "Temporarily disable compilation of the v3 hs fuzzing code"
...
This reverts commit 5ef656e7d1
2017-10-26 09:41:47 -04:00
Nick Mathewson
62cd64cc16
fix check-changes warning
2017-10-26 09:08:49 -04:00
George Kadianakis
e0276dc1c6
Add changes file for #23862 .
2017-10-26 13:36:04 +03: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
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
274de0e2bc
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid version bump
2017-10-25 09:28:57 -04:00
Nick Mathewson
7c2f688fb9
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump
2017-10-25 09:28:49 -04:00
Nick Mathewson
6ce8cc5dbb
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" merge to avoid version bump
2017-10-25 09:28:41 -04:00
Nick Mathewson
151d5ededf
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump
2017-10-25 09:28:29 -04:00
Nick Mathewson
faf568fa7e
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" merge to avoid version bump
2017-10-25 09:28:15 -04:00
Nick Mathewson
f68c1b1406
bump to 0.3.1.8-dev
2017-10-25 09:28:05 -04:00
Nick Mathewson
4edbbee2fd
bump to 0.3.0.12-dev
2017-10-25 09:27:50 -04:00
Nick Mathewson
46091a88ca
bump to 0.2.9.13-dev
2017-10-25 09:27:23 -04:00
Nick Mathewson
9969b0dfda
bump to 0.2.8.16-dev
2017-10-25 09:27:07 -04:00
Nick Mathewson
82f8b27ff5
bump to 0.2.5.15-dev
2017-10-25 09:26:53 -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
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
44e8aaa9aa
Adjust test to allow hyphens too.
2017-10-24 19:33:38 -04:00
