nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-22 14:04:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
26,780 Commits 53 Branches 629 Tags 108 MiB
525c1c493e
Commit Graph

26780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
122a7f8848 Merge branch 'maint-0.3.1' into 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
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
Nick Mathewson
d4befa035d bump to 0.2.8.16 2017-10-24 09:09:10 -04:00
Nick Mathewson
743eee4930 bump to 0.2.5.15 2017-10-24 09:09:00 -04:00
Nick Mathewson
0d4addfc73 Merge branch 'bug23952_032' into maint-0.3.2 2017-10-24 08:24:12 -04:00
Nick Mathewson
f0a6ea0bfd Merge branch 'maint-0.3.0' into maint-0.3.1 2017-10-23 15:55:48 -04:00
Nick Mathewson
b1d6cf2508 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-10-23 15:55:48 -04:00
Nick Mathewson
9ae4ffc076 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-10-23 15:55:08 -04:00
Nick Mathewson
b1bd1bf19f Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 2017-10-23 15:53:45 -04:00
Nick Mathewson
48ee85e0c6 Have LOG_PROTOCOL_WARN call its own function 
Also, make the function that implements LOG_PROTOCOL_WARN use a
cached value of the desired loglevel, rather than calling
get_options().
 2017-10-23 12:22:26 -04:00
Nick Mathewson
8b8d501040 Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" merge to avoid taking af33fdd7c1
 2017-10-23 09:22:43 -04:00
Nick Mathewson
af33fdd7c1 Remove the length limit from write_http_status_line 
Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7ba,
where arma said "get rid of the scary 256-byte-buf landmine".
 2017-10-23 09:21:22 -04:00
Nick Mathewson
fcd5c3144a Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-23 09:11:10 -04:00
Nick Mathewson
eac4c374e4 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-10-23 09:11:10 -04:00
Nick Mathewson
6a7aa47357 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-10-23 09:11:10 -04:00
Nick Mathewson
85115796bb Merge branch 'maint-0.3.0' into maint-0.3.1 2017-10-23 09:11:10 -04:00
Nick Mathewson
a5f5bda462 Adjust test, now that there are 9 dirauths again 2017-10-23 09:11:07 -04:00