Commit Graph

26880 Commits

Author SHA1 Message Date
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
Taylor Yu
9b60acd4d4 Rewrite bridge addresses earlier
Call rewrite_node_address_for_bridge() in
launch_direct_bridge_descriptor_fetch() in case there's an existing
node_t for it.
2017-10-24 17:35:17 -05:00
Nick Mathewson
f709dce414 Repair "make check" 2017-10-24 12:54:21 -04:00
Nick Mathewson
649000662d Merge remote-tracking branch 'arma/ticket23637' 2017-10-24 12:52:41 -04:00
Nick Mathewson
122a7f8848 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-10-24 09:11:38 -04:00
Nick Mathewson
350fecfafe Merge branch 'maint-0.3.2' 2017-10-24 09:11:38 -04:00
Nick Mathewson
990322fca4 Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid version bump
2017-10-24 09:11:33 -04:00
Nick Mathewson
7bebd1b025 Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump
2017-10-24 09:11:24 -04:00
Nick Mathewson
5325e7ccab bump version in the other places :/ 2017-10-24 09:11:17 -04:00
Nick Mathewson
552b620280 bump version in the other places :/ 2017-10-24 09:11:07 -04:00
Nick Mathewson
51de3a1c15 Merge branch 'maint-0.3.2' 2017-10-24 09:10:43 -04:00
Nick Mathewson
cce1a6efa6 Merge branch 'maint-0.3.1' into maint-0.3.2
"ours" merge to avoid version bump
2017-10-24 09:10:37 -04:00
Nick Mathewson
38a58076e9 Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid version bump
2017-10-24 09:10:30 -04:00
Nick Mathewson
302b5f577d Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump
2017-10-24 09:10:24 -04:00
Nick Mathewson
725f237104 Merge branch 'maint-0.2.8' into maint-0.2.9
"ours" merge to avoid version bump
2017-10-24 09:10:17 -04:00
Nick Mathewson
912ebf165f Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" merge to avoid version bump
2017-10-24 09:10:04 -04:00
Nick Mathewson
cbb41ddfef bump to 0.3.1.8 2017-10-24 09:09:50 -04:00
Nick Mathewson
d913a7317b bump to 0.3.0.12 2017-10-24 09:09:35 -04:00
Nick Mathewson
09d2ae562a bump to 0.2.9.13 2017-10-24 09:09:26 -04:00