Commit Graph

35297 Commits

Author SHA1 Message Date
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
David Goulet
6c5c503a4c
configure: Fix enabled module variable expansion
Fixes #33646

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-01 23:02:24 +10:00
David Goulet
eecf6c5199 hs-v3: Move to log notice the registration of an OB instance
This is to allow a visual feedback in the logs for operators setting up Onion
Balance so they can confirm they properly configured the instances.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-01 08:31:20 -04:00
David Goulet
b5412d12f9 Merge branch 'tor-github/pr/1844' 2020-04-01 08:22:36 -04:00
George Kadianakis
8fda94f944 hs-v3: Move ob_subcreds to hs_service_state_t.
It's more natural there since it's runtime state.
2020-03-30 23:37:26 +03:00
George Kadianakis
0667a5af8d hs-v3: Don't crash after SIGHUP in Onionbalance backend mode.
The ob_subcreds array was not copied after SIGHUP, and that left the
post-SIGHUP service with a NULL ob_subcreds pointer (until the next descriptor
gets build where we regenerate ob_subcreds in hs_ob_refresh_keys()).

Fixes bug #33762; not in any released tor version.
2020-03-30 23:35:19 +03:00
David Goulet
ca8e6451f2 Merge branch 'maint-0.4.3' 2020-03-30 13:38:58 -04:00