teor
f431b78465
Merge branch 'maint-0.4.3'
...
"ours" merge, because we only want to remove check-best-practices
from check-local in 0.4.2 and 0.4.3.
2020-04-09 19:42:36 +10:00
teor
1ae0839ef2
Merge branch 'maint-0.4.2' into maint-0.4.3
...
Remove check-best-practices from check-local in maint-0.4.3.
(The check-local jobs are all on separate lines in 0.4.3.)
2020-04-09 19:41:19 +10:00
Nick Mathewson
2d34d4d1af
remove practracker from check-local (0.4.2 and 0.4.3 only)
...
practracker shouldn't be running in release or maint branches.
2020-04-09 19:39:28 +10:00
teor
4e3a17facd
Merge branch 'maint-0.4.3'
...
"ours" merge, to avoid taking PR 1854, which reverts
"Prefer IPv6 by default" for 0.4.3 only.
2020-04-09 11:06:51 +10:00
teor
f6efb3a184
Merge branch 'pr1854_squashed' into maint-0.4.3
...
Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).
2020-04-09 11:05:59 +10:00
David Goulet
cd2121a126
client: Revert setting PreferIPv6 on by default
...
This change broke torsocks that by default is expecting an IPv4 for hostname
resolution because it can't ask tor for a specific IP version with the SOCKS5
extension.
PreferIPv6 made it that sometimes the IPv6 could be returned to torsocks that
was expecting an IPv4.
Torsocks is probably a very unique case because the runtime flow is that it
hijacks DNS resolution (ex: getaddrinfo()), gets an IP and then sends it back
for the connect() to happen.
The libc has DNS resolution functions that allows the caller to request a
specific INET family but torsocks can't tell tor to resolve the hostname only
to an IPv4 or IPv6 and thus by default fallsback to IPv4.
Reverting this change into 0.4.3.x series but we'll keep it in the 0.4.4.x
series in the hope that we add this SOCKS5 extension to tor for DNS resolution
and then change torsocks to use that.
Fixes #33804
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-09 11:05:32 +10:00
teor
59819b2916
Merge branch 'maint-0.4.3'
2020-04-09 11:03:40 +10:00
teor
2d6f00e45b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-04-09 11:03:34 +10:00
teor
2d7e08d57e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-04-09 11:03:27 +10:00
teor
987f2fa50a
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-04-09 11:03:20 +10:00
teor
d380acaeca
Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5
2020-04-09 11:02:49 +10:00
Roger Dingledine
9bd73da7cf
fix typos from #32542
2020-04-08 19:13:52 -04:00
George Kadianakis
7a82c972ef
Merge branch 'tor-github/pr/1857'
2020-04-08 18:15:37 +03:00
David Goulet
92ae8cea30
changes: Add changes file for #32542
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-08 18:15:21 +03:00
David Goulet
9b72a561f5
test: Unit test for missing ExtendedErrors
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-08 18:15:21 +03:00
David Goulet
dd25805152
man: Update tor.1 ExtendedErrors section with latest
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-08 18:15:21 +03:00
David Goulet
c1bf819a31
Merge branch 'maint-0.4.3'
2020-04-08 09:42:13 -04:00
Mrigyen Sawant
34faee0600
Correct 'was not internal' to 'was internal' in test_external_ip()
2020-04-08 09:41:58 -04:00
George Kadianakis
0b0b8a5b6d
Merge branch 'tor-github/pr/1855'
2020-04-08 16:31:37 +03:00
David Goulet
6ab11bbf30
hs-v3: Report SOCKS ExtendedErrors when all intro timed out
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-08 07:56:54 -04:00
David Goulet
cf39276f78
hs-v3: Report rendezvous circuit failure SOCKS ExtendedErrors
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-08 07:56:54 -04:00
David Goulet
fdd6352506
hs-v3: Report introduction failure SOCKS ExtendedErrors
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-08 07:56:54 -04:00
teor
1720a2191d
address: Simplify tor_addr_is_valid()
...
And rewrite the function comment.
Part of 33679.
2020-04-07 23:11:17 +05:30
MrSquanchee
cbd3f88831
Added tests for tor_addr_is_null/valid()
...
Added tests for tor_addr_is_valid(),
and added tests for tor_addr_is_null(),
which is not modfied.
Ticket 33679
2020-04-07 23:11:17 +05:30
David Goulet
6fbf624b50
hs-v3: Fix typo in log info when PublishHidServDescriptors is set to 0
...
Fixes #33779
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-07 13:17:21 -04:00
teor
065ccda4f6
Merge branch 'pr1838_squashed'
2020-04-07 17:36:17 +10:00
Nick Mathewson
ea9ff58921
Try rewriting normalize_srcdir to normalize harder.
2020-04-07 17:36:05 +10:00
Nick Mathewson
d3db84c1e7
Make check_subsystem_order work in distcheck builds.
2020-04-07 17:36:02 +10:00
Nick Mathewson
5f49695f94
Make check_subsystem_order work in out-of-tree builds.
2020-04-07 17:35:58 +10:00
Nick Mathewson
f9c57313d0
add changes file for 31634
2020-04-07 17:35:55 +10:00
Nick Mathewson
9b434b79ce
Add a test script to check subsystem order as part of make check.
2020-04-07 17:35:51 +10:00
teor
00ce25a720
channel: Fix a comment typo
2020-04-06 19:10:30 +10:00
teor
6df16022a1
channel: Remove a newline at the start of the file
2020-04-06 19:08:33 +10:00
teor
7adf72f1b4
Merge branch 'maint-0.4.3'
2020-04-05 17:17:51 +10:00
teor
80a306c6e7
doc: Fix another man page typo
...
The default value of the option is "auto", not "default".
2020-04-05 17:17:03 +10:00
teor
5c35bb38df
Merge branch 'maint-0.4.3'
2020-04-05 17:12:11 +10:00
teor
613077229f
doc: Fix a typo in the man page
...
"proceeding" means starting an action.
"preceding" means the thing before this thing.
In this context, it's a bit ambiguous.
2020-04-05 17:10:37 +10:00
teor
1e75974362
core/or: Fix a comment typo in onion.h
...
Comment-only change.
2020-04-04 15:05:34 +10:00
teor
a84fd949ed
Merge branch 'maint-0.4.3'
2020-04-04 13:23:56 +10:00
teor
b1e1c6b505
changes: file for ticket 33782
...
Avoid conflicts between the fake sockets in tor's unit tests, and real
file descriptors. Resolves issues running unit tests with GitHub
Actions, where the process that embeds or launches the tests has
already opened a large number of file descriptors.
Fixes bug 33782; bugfix on 0.2.8.1-alpha.
Found and fixed by Putta Khunchalee.
2020-04-04 13:20:06 +10:00
teor
c0fe88b236
doc: Also stop running practracker in hooks
...
When making a new maint branch, stop running practracker in hooks.
2020-04-03 22:10:01 +10:00
teor
6db2e59f20
doc: Minor restructure for Release Lifecycle
...
* make end and beginning of life into second-level sections
* write an intro for beginning
* tweak intro for end
2020-04-03 22:06:27 +10:00
teor
0f10ddaa29
Re-apply: doc: Replace "underline" with "## Section name".
...
Re-applying changes after merge.
2020-04-03 22:02:11 +10:00
teor
0efcdb8918
Merge remote-tracking branch 'tor-github/pr/1739'
...
Ignored conflicting style changes: they will be re-applied in
the next commit.
2020-04-03 21:59:19 +10:00
Putta Khunchalee
f43a841d94
Change starting file descriptor for tests.
2020-04-03 16:47:38 +07:00
teor
a762234ba2
scripts: Ignore editor temporary files
...
Ignore editor temporary files when autostyling in:
* rectify_include_paths.py
* rename_c_identifier.py
Obviously correct changes to already-reviewed code.
2020-04-03 19:16:57 +10:00
teor
442e0caea2
Merge branch 'maint-0.4.3'
2020-04-03 14:44:34 +10:00
teor
7d2b6cacee
doc: Rewrite the approved-routers man page entry
...
Obviously correct documentation changes.
2020-04-03 14:43:48 +10:00
George Kadianakis
6fbb9af96c
Merge branch 'tor-github/pr/1851'
2020-04-02 02:38:11 +03:00
teor
a8a92b9456
Merge branch 'maint-0.4.3'
2020-04-01 23:03:51 +10:00
