torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,523 Commits 53 Branches 631 Tags
c4804bb280f16a484d9d5d1ed4aae8bc1614cfce
Commit Graph
26523 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson c4804bb280 Merge branch 'maint-0.3.2' 
"ours" to avoid version bump
 2017-10-27 08:59:19 -04:00
Nick Mathewson fb88527195 update to 0.3.2.3-alpha 2017-10-27 08:59:07 -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 dfe03a55fc doc: Add fedora packager point of contact 
This is a link to the user page on the Fedora project website:

https://koji.fedoraproject.org/koji/userinfo?userID=2234

Fixes #24015

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-10-26 10:07:56 -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 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 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 1a6814c096 Fix offending unittest and add changes file for #23862. 2017-10-25 20:22:52 +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
Roger Dingledine 853bbb9112 reach into the past and fix a typo 2017-10-25 13:13:52 -04: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 55a3dad708 Merge branch 'maint-0.3.2' 2017-10-25 09:29:01 -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 8b09450819 Oops. Fix up the changelog I just sent out. :( 2017-10-25 09:24:24 -04:00
Nick Mathewson ed0c6a3a4b forward-port releasenotes and changelog entries. 2017-10-25 08:08:14 -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 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
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
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