Nick Mathewson
9f2efd02a1
Minimal implementation of bridge-distribution-request
...
Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.
This is done in lieu of a full backport of #18329 .
2017-11-13 20:44:51 -05:00
Nick Mathewson
1d5e693b63
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 20:36:04 -05:00
Nick Mathewson
50fbede459
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 20:36:04 -05:00
Nick Mathewson
fe04a19cb7
Merge branch 'maint-0.3.2'
2017-11-13 20:36:04 -05:00
Nick Mathewson
6059784be0
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 20:36:04 -05:00
Nick Mathewson
1b9bb2c847
Merge branch 'bug22895_027' into maint-0.2.9
2017-11-13 20:35:59 -05:00
Nick Mathewson
5a9b0374a0
Merge branch 'maint-0.3.2'
2017-11-13 16:58:21 -05:00
Nick Mathewson
985c41b500
add a missing subcategory to 23637, again
2017-11-13 16:58:11 -05:00
Nick Mathewson
562b3c9678
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 12:57:58 -05:00
Nick Mathewson
fea5c8a015
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 12:57:58 -05:00
Nick Mathewson
543fd89fb7
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-13 12:57:58 -05:00
Nick Mathewson
a5a87c1d97
Merge branch 'maint-0.3.2'
2017-11-13 12:57:58 -05:00
Nick Mathewson
05ae995665
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 12:57:58 -05:00
Nick Mathewson
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
Nick Mathewson
0c6d05cdd4
Merge branch 'maint-0.3.2'
2017-11-13 12:27:44 -05:00
Nick Mathewson
d0b75b5ade
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 12:27:36 -05:00
David Goulet
7df28ce299
hs-v3: Fix consensus param "hsdir-interval" name
...
The dir-spec.txt specifies it to be "hsdir_interval" (underscore).
Fixes #24262
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-13 11:48:56 -05:00
Nick Mathewson
527eb563cb
Remove changes files for those items already merged in 0.3.2
2017-11-13 11:45:55 -05:00
Nick Mathewson
0b4e59b7c6
Merge remote-tracking branch 'sebastian/bug24137'
2017-11-13 11:32:35 -05:00
Nick Mathewson
45fb624e38
Merge branch 'maint-0.3.2'
2017-11-13 11:20:23 -05:00
Nick Mathewson
3300a6e93a
Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2
2017-11-13 11:20:20 -05:00
Nick Mathewson
e209e8e3c1
Merge branch 'maint-0.3.2'
2017-11-13 11:19:12 -05:00
Nick Mathewson
cf1e6ad2d7
Merge branch 'bug24247_032' into maint-0.3.2
2017-11-13 11:19:09 -05:00
Nick Mathewson
16bdb9e365
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:18:02 -05:00
Nick Mathewson
91188540af
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 11:18:02 -05:00
Nick Mathewson
b9da340cdf
Merge branch 'maint-0.3.2'
2017-11-13 11:18:02 -05:00
Nick Mathewson
6f9ab69b6d
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 11:18:02 -05:00
Nick Mathewson
ab415ae950
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
2017-11-13 11:17:58 -05:00
Nick Mathewson
9092e9019a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:15:50 -05:00
Nick Mathewson
89b9951ecd
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 11:15:50 -05:00
Nick Mathewson
122ee5b13a
Merge branch 'maint-0.3.2'
2017-11-13 11:15:50 -05:00
Nick Mathewson
7dddef2a76
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 11:15:50 -05:00
Nick Mathewson
666653758d
Merge branch 'bug8185_025' into maint-0.2.9
2017-11-13 11:15:47 -05:00
Nick Mathewson
0fc2b7f82e
Merge branch 'bug8185_031' into maint-0.3.1
2017-11-13 11:15:40 -05:00
Nick Mathewson
ece63105d9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:13:22 -05:00
Nick Mathewson
e53daee2f4
Merge branch 'maint-0.3.2'
2017-11-13 11:13:22 -05:00
Nick Mathewson
441bfcd885
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-13 11:13:22 -05:00
Nick Mathewson
2777b469fa
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-13 11:13:22 -05:00
Nick Mathewson
c928fb988a
Merge branch 'ticket21953_029' into maint-0.2.9
2017-11-13 11:13:18 -05:00
Nick Mathewson
ebcd1a57c0
Note in the rust doc that these comments are bidirectional
2017-11-13 10:04:40 -05:00
Nick Mathewson
fdefda95bc
Add corresponding rust-c coupling comments to C
2017-11-13 10:03:46 -05:00
Nick Mathewson
edf3d6b7ee
Merge remote-tracking branch 'chelseakomlo/24032-cargo-rust-sync'
2017-11-13 09:59:10 -05:00
Chelsea Holland Komlo
05662f35ea
update rust getting started for new build
2017-11-13 09:55:29 -05:00
Nick Mathewson
a5ef2b619d
Make node_get_curve25519_onion_key() return a const ptr
2017-11-12 17:07:16 -05:00
Nick Mathewson
f92736517b
Merge branch 'bug23577_squashed'
2017-11-12 17:05:39 -05:00
Neel Chauhan
fb718e9912
Make setup_introduce1_data() take a node_t instead of an extend_info_t
...
Clients add rendezvous point IPv6 addresses to introduce cell link specifiers,
when the node has a valid IPv6 address.
Also check the node's IPv4 address is valid before adding any link specifiers.
Implements #23577 .
2017-11-12 17:05:25 -05:00
Neel Chauhan
0ee50a414c
Introduce node_get_curve25519_onion_key()
2017-11-12 17:05:25 -05:00
Chelsea Holland Komlo
1c50331b9a
annotate where C and Rust need to stay in sync
2017-11-11 23:19:34 -05:00
Nick Mathewson
11eaf208c0
Merge branch 'bug24247_032'
2017-11-11 14:46:33 -05:00
Nick Mathewson
a7ca71cf6b
Fix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keys
...
This function -- a mock replacement used only for fuzzing -- would
have a buffer overflow if it got an RSA key whose modulus was under
20 bytes long.
Fortunately, Tor itself does not appear to have a bug here.
Fixes bug 24247; bugfix on 0.3.0.3-alpha when fuzzing was
introduced. Found by OSS-Fuzz; this is OSS-Fuzz issue 4177.
2017-11-11 14:44:45 -05:00
