David Goulet
7a6e1f2491
scripts: Fix rename_c_identifier.py uncommitted warning
...
Only warn when we actually want a commit _and_ there are uncommitted changes
found. Else, it is fine to rename if the script is not creating a commit.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-30 13:48:22 -04:00
Alexander Færøy
96876d3ad7
Merge branch 'tor-github/pr/1940'
2020-06-30 01:22:44 +00:00
Nick Mathewson
86aa84e634
Merge branch 'maint-0.4.4'
2020-06-29 13:57:50 -04:00
Nick Mathewson
feddba6f8b
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:57:50 -04:00
Nick Mathewson
eef77227ef
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:57:41 -04:00
Nick Mathewson
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
Nick Mathewson
5b47a58d16
Merge branch 'maint-0.4.4'
2020-06-29 13:56:16 -04:00
Nick Mathewson
b2ce815bd8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:56:16 -04:00
Nick Mathewson
d124cfc058
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:56:04 -04:00
Nick Mathewson
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
Nick Mathewson
def7844c4f
Merge branch 'maint-0.4.4'
2020-06-29 13:48:32 -04:00
Nick Mathewson
9e85515f83
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:48:32 -04:00
Nick Mathewson
31bdfd4920
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:48:32 -04:00
Nick Mathewson
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
Nick Mathewson
6b71cc64cf
Merge branch 'maint-0.4.4'
2020-06-29 12:58:50 -04:00
Nick Mathewson
6fb31bb34a
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:58:50 -04:00
Nick Mathewson
f862971d04
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 12:58:50 -04:00
Nick Mathewson
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00
Nick Mathewson
ea3a25ff51
Merge branch 'maint-0.4.4'
2020-06-29 12:56:50 -04:00
Nick Mathewson
41a4243901
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:56:50 -04:00
Nick Mathewson
3008255aea
Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3
2020-06-29 12:56:39 -04:00
Nick Mathewson
fd8ce812b0
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-29 12:55:35 -04:00
Nick Mathewson
c2843f9fe4
Merge branch 'maint-0.4.4'
2020-06-29 12:55:35 -04:00
Nick Mathewson
2c61f22e43
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:55:35 -04:00
Nick Mathewson
183d0d30d6
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 12:55:35 -04:00
Nick Mathewson
0c0214bcc0
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
2020-06-29 12:55:27 -04:00
Alexander Færøy
f1932265fc
Merge branch 'dgoulet/tor-ticket40008_045_01'
2020-06-29 14:09:53 +00:00
Nick Mathewson
5336ac2669
Move remaining CodeStructure.md contents into doxygen.
2020-06-26 10:11:42 -04:00
Nick Mathewson
e269e081a1
Remove changes files that appeared in tor 0.4.4.1-alpha.
2020-06-26 09:50:57 -04:00
Nick Mathewson
dbc2b75009
Merge branch 'assume_reachable_revamp'
2020-06-26 08:34:56 -04:00
Nick Mathewson
cb25f57724
Remove stub macro for router_new_consensus_params()
...
I had incorrectly believed that the router.c file was disabled when
we were building with relay mode disabled.
2020-06-26 08:32:33 -04:00
David Goulet
40922629fe
addr: Look at /48 for IPv6 in is_local_addr()
...
Closes #33618
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-25 13:45:05 -04:00
David Goulet
069566b40a
Merge branch 'tor-github/pr/1951'
2020-06-25 13:41:45 -04:00
David Goulet
374626c09b
Merge branch 'tor-github/pr/1917'
2020-06-25 13:35:34 -04:00
Neel Chauhan
7b2ab93f65
Add test for fingerprint-ed25519 file
2020-06-25 13:35:15 -04:00
Neel Chauhan
ef563a8fef
Add an fingerprint-ed25519 file to the data directory
2020-06-25 13:35:15 -04:00
David Goulet
dc4f3a219f
Merge branch 'tor-github/pr/1948'
2020-06-25 10:13:04 -04:00
Nick Mathewson
50abc06d84
Remove now-unused OPTIONS_DUMP_DEFAULTS.
2020-06-25 10:02:17 -04:00
Nick Mathewson
62e1d983cf
Deprecate the "--dump-config non-builtin" option
...
When it works, "non-builtin" doesn't do anything different from
"short". (When it doesn't work, it gives an assertion failure.)
Closes ticket #33398 .
2020-06-25 10:01:40 -04:00
David Goulet
c370b4a049
Merge branch 'maint-0.4.4'
2020-06-25 07:36:56 -04:00
David Goulet
fd5b2d0f1c
Merge branch 'tor-github/pr/1935'
2020-06-24 15:48:47 -04:00
Neel Chauhan
c8fd7b7040
Make HSFETCH take the decoded length into account, not the base32 one
2020-06-24 15:47:57 -04:00
Alexander Færøy
7934dcc6f3
Merge branch 'ahf/gitlab-readme' into 'master'
...
Update Trac links in README to point to Gitlab.
See merge request tpo/core/tor!3
2020-06-24 19:34:32 +00:00
Nick Mathewson
edb023b1e7
Add an AssumeReachableIPv6 autobool option.
...
This option tells Tor that our IPv6 orport is reachable, and doesn't
need to be checked.
Closes the rest of 33224.
2020-06-24 15:25:34 -04:00
Nick Mathewson
6edf7f6710
Add two new networkstatus parameters to emulate AssumeReachable.
...
These parameters do not suppress checks, but they tell relays that
it's okay to publish even when those checks fail.
I have chosen lowercase hyphenated names, since these seem to be
more common in networkstatus params.
Closes #33224 and part of #34064 .
2020-06-24 15:25:26 -04:00
Nick Mathewson
f9de0affd3
Rename router_should_skip_orport_reachability_check.
...
This was supposed to happen in #40012 , but the command line was wrong.
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
router_should_skip_orport_reachability_check router_all_orports_seem_reachable
2020-06-24 15:25:17 -04:00
Nick Mathewson
5c5fb0fcca
Move code into notify_after_networkstatus_changes().
...
The purpose of having this function was to inform other code that
the consensus has changed, so it should go there.
2020-06-24 15:25:12 -04:00
Nick Mathewson
93ccb3294b
Make a bunch of networkstatus_t parameters constant.
...
This is part of refactoring our "notify the rest of the code that we
have a new consensus" code.
2020-06-24 15:25:07 -04:00
Nick Mathewson
366c695020
Add a control event for launching IPv6 ORPort checks.
2020-06-24 14:00:34 -04:00
David Goulet
86da0cfd36
Merge branch 'tor-github/pr/1945'
2020-06-24 13:51:51 -04:00
