David Goulet
ef2123c7c7
hs-v3: Disallow single hop client to post/get a descriptor
...
Closes #24964
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-07-03 08:21:16 -04:00
Nick Mathewson
fdbd139495
Merge remote-tracking branch 'tor-github/pr/1136'
2019-07-02 13:33:50 -04:00
Nick Mathewson
cf92c096ad
Merge remote-tracking branch 'tor-github/pr/1120'
2019-07-02 13:33:37 -04:00
George Kadianakis
15e28af2d1
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'
2019-07-02 13:19:40 +03:00
Nick Mathewson
c0ea6f9c64
Merge branch 'maint-0.4.1'
2019-07-01 14:25:13 -04:00
Nick Mathewson
5e16601000
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-07-01 14:25:12 -04:00
Nick Mathewson
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
Nick Mathewson
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
Roger Dingledine
a5911c4551
get rid of accidental second space
2019-06-29 22:26:00 -04:00
teor
fb977f8cac
changes: file for 28795
...
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.
Closes ticket 28795.
Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
2019-06-28 21:38:33 +10:00
teor
f3b2a81ce7
fallback: apply the second fallback list from 2019
...
Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:16:50 +10:00
teor
37c2808ab0
fallback: apply the first fallback list from 2019
...
Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:05:00 +10:00
David Goulet
f446db59e1
man: Fix -help typo to --help
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-27 14:52:12 -04:00
David Goulet
c34a6b922f
Merge branch 'tor-github/pr/1129'
2019-06-27 10:19:45 -04:00
teor
362afa8c4e
doc: update the man page entries for DirAuthority and FallbackDir
...
Improve the documentation for the DirAuthority and FallbackDir torrc
options.
Closes ticket 30955.
2019-06-27 10:19:40 -04:00
David Goulet
6afe1b00c9
Merge branch 'tor-github/pr/1140'
2019-06-26 11:39:33 -04:00
Nick Mathewson
da11304136
Merge branch 'maint-0.4.1'
2019-06-26 10:06:02 -04:00
Nick Mathewson
3ccf91027b
Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
2019-06-26 10:05:51 -04:00
Nick Mathewson
089ef46063
Merge branch 'bug30721_squashed'
2019-06-26 09:57:20 -04:00
teor
6ef555bda0
test/addr: test that tor_addr_port_lookup() handles IP addresses and ports
...
And that it does something sensible with host and host:port.
Also reorder the tests into valid, invalid, and ambiguous.
And add some missing cases.
Note: tor_addr_port_lookup() handles ip, ip:port, host, and host:port.
Tests for 30721.
2019-06-26 09:55:37 -04:00
teor
6079dfd103
test/addr: test that tor_addr_lookup() handles IP addresses
...
And that it fails on IP:port and host:port, and does something sensible with
host.
Tests for 30721.
2019-06-26 09:55:37 -04:00
teor
1c92d7f388
test/addr: test that tor_lookup_hostname() handles IPv4 addresses
...
And that it fails on IPv6 and host:port, and does something sensible with
host.
Tests for 30721.
2019-06-26 09:55:37 -04:00
teor
60ce431c54
test/addr: Add some ambiguous IPv6 cases to test_addr_parse()
...
Test some strings which could be parsed as IPv6 addresses,
or as IPv6:port strings.
Additional tests for 30721.
2019-06-26 09:55:37 -04:00
teor
2dbde3617f
test/addr: Increase coverage in test_addr_parse()
...
Do as many tests as possible for each input string.
Then remove some redundant test cases.
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
5a3770dc6c
test/addr: Stop repeating so much code in test_addr_parse()
...
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
1d3d6bf6b1
test/addr: Add unit tests for the fixes in 30721
2019-06-26 09:55:37 -04:00
teor
adb8538e7b
address/resolve: Require square brackets on IPv6 address:ports
...
When parsing addreses via Tor's internal address:port parsing and
DNS lookup APIs, require IPv6 addresses with ports to have square
brackets.
But allow IPv6 addresses without ports, whether or not they have
square brackets.
Fixes bug 30721; bugfix on 0.2.1.5-alpha.
2019-06-26 09:55:37 -04:00
teor
308d300213
address/resolve: try harder to avoid returning uninitialised data
...
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
fb93646c1c
resolve: split sub-functions out of tor_addr_lookup()
...
And remove the practracker exception for tor_addr_lookup().
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
29cf64c838
resolve: refactor address family logic in tor_addr_lookup()
...
Cleanup after 30721.
2019-06-26 09:55:37 -04:00
teor
cd1de99468
resolve: consistently parse IP addresses in square brackets
...
When parsing addreses via Tor's internal DNS lookup API:
* reject IPv4 addresses in square brackets (with or without a port),
* accept IPv6 addresses in square brackets (with or without a port), and
* accept IPv6 addresses without square brackets, as long as they have no port.
This change completes the work started in 23082, making address parsing
consistent between tor's internal DNS lookup and address parsing APIs.
Fixes bug 30721; bugfix on 0.2.1.5-alpha.
2019-06-26 09:55:36 -04:00
Nick Mathewson
c2a326d34f
Merge branch 'maint-0.4.1'
...
"ours" to avoid the 0.4.1 version of #30871 .
2019-06-26 09:50:12 -04:00
Nick Mathewson
0fe9657c8c
Merge remote-tracking branch 'tor-github/pr/1119'
2019-06-26 09:50:00 -04:00
Nick Mathewson
648d5df628
Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1
2019-06-26 09:49:40 -04:00
Nick Mathewson
167dd097e0
Merge remote-tracking branch 'tor-github/pr/1127'
2019-06-26 09:40:01 -04:00
George Kadianakis
72ef4f43d5
Merge branch 'tor-github/pr/1142'
2019-06-26 10:57:24 +03:00
George Kadianakis
7edd01a29b
Merge branch 'tor-github/pr/1109'
2019-06-26 10:56:08 +03:00
George Kadianakis
a57296da31
Merge branch 'tor-github/pr/1139'
2019-06-26 10:55:05 +03:00
George Kadianakis
fede64822d
Merge branch 'tor-github/pr/1128'
2019-06-26 10:53:34 +03:00
George Kadianakis
b2ef076e1a
Merge branch 'maint-0.4.1'
2019-06-26 10:51:50 +03:00
George Kadianakis
00acccac64
Merge branch 'tor-github/pr/1114' into maint-0.4.1
2019-06-26 10:51:12 +03:00
Taylor Yu
5612eccef8
Changes file for ticket 30889
2019-06-25 11:42:41 -05:00
Taylor Yu
5faf54970d
Fix some onion helpers
...
Fix add_onion_helper_clientauth() and add_onion_helper_keyarg() to
explicitly call the appropriate control reply abstractions instead of
allocating a string to pass to their callers.
Part of ticket 30889.
2019-06-25 11:42:34 -05:00
Taylor Yu
e5e6953be7
Make control_write_reply() mockable
...
Part of ticket 30889.
2019-06-25 11:40:44 -05:00
Taylor Yu
0dd59fdb56
Clean up some uses of low-level control replies
...
Part of ticket 30889.
2019-06-25 11:39:59 -05:00
Nick Mathewson
3644f4ab5f
Remove changes files that appeared in 0.4.1.3-alpha or earlier.
2019-06-25 11:57:08 -04:00
Nick Mathewson
3a9b41895f
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-06-25 11:56:22 -04:00
Nick Mathewson
fe41504309
forward-port the 0.4.1.3-alpha changelog
2019-06-25 11:56:08 -04:00
Nick Mathewson
e4f66bf7ff
bump to 0.4.1.3-alpha-dev
2019-06-25 11:55:53 -04:00
teor
c131b0763e
stats: add comments about the required chunk structure in extra info files
...
These comments should prevent future instances of 30958.
And allow a larger file in practracker.
Follow up after 30958.
2019-06-25 12:30:59 +10:00