01a797be4e
Merge branch 'tor-github/pr/1334'
2019-09-25 14:19:02 +03:00
0a77e5f1c2
Merge branch 'tor-github/pr/1341'
2019-09-25 14:18:15 +03:00
09769779a0
Merge branch 'tor-github/pr/1357'
2019-09-25 14:17:35 +03:00
2199629648
Merge branch 'tor-github/pr/1345'
2019-09-25 14:14:30 +03:00
99f75373de
Merge branch 'tor-github/pr/1309'
2019-09-25 14:12:42 +03:00
0cb57a4908
feature/control: add a missing word to the send_control_done() comment
2019-09-24 15:08:37 +10:00
dfea789203
log: Improve the documentation for tor_log_update_sigsafe_err_fds()
...
Part of 31839.
2019-09-24 15:04:03 +10:00
e1429d9148
fix typo in comment
2019-09-23 18:32:05 -04:00
c309169217
microdesc_parse: convert some ints to bools
...
Noted by ahf during review of #31675
2019-09-19 14:37:24 -04:00
194884977c
microdesc_parse: Rename "next" label to "err".
2019-09-19 14:37:24 -04:00
2094796c24
Reindent microdesc_parse_fields().
...
I suggest reviewing this with -b: it should be whitespace-only.
2019-09-19 14:37:24 -04:00
ec368409fa
Extract field-parsing code for microdesc_parse.c
...
The code here parses the fields from the microdescriptor, including
possible annotations, and stores them into a microdesc_t object.
This commit is almost pure code movement; I recommend using
--color-moved to review it.
2019-09-19 14:37:24 -04:00
b1552e8814
Reindent microdesc_extract_body().
...
This commit is whitespace-only; I suggest reviewing with -b.
2019-09-19 14:37:24 -04:00
9cbc166ea0
Extract the body-copying portion of microdesc parsing
...
This code is logically independent of the rest of the function, and
goes better in its own function.
This is almost purely code movement; I suggest reviewing with
--color-moved.
2019-09-19 14:37:24 -04:00
69a1f9c8a7
test: test dirserv_router_has_valid_address() with DirAllowPrivateAddresses
...
Part of 31793.
2019-09-19 16:19:19 +10:00
c2ceede376
test: refactor dirserv_router_has_valid_address() tests
...
Cleanup after 31793.
2019-09-19 16:19:16 +10:00
03c2b1be8d
dirauth: reorder the checks in dirserv_router_has_valid_address()
...
To avoid a bug warning.
Fixes 31793. Bug not in any release, no changes file required.
2019-09-19 16:19:12 +10:00
46fea1dfee
test: dirserv_router_has_valid_address() with zero-family addresses
...
Sometimes tor doesn't initialise an address, so its family is zero.
Failing test for 31793. Future commits will fix the code.
2019-09-19 16:19:04 +10:00
4bbefc2aac
Merge branch 'bug30916_035' into bug30916_041
2019-09-18 11:19:41 -04:00
2da4d64a64
Avoid a crash if our "current" and "old" ntor onion keys are equal
...
Our dimap code asserts if you try to add the same key twice; this
can't happen if everything is running smoothly, but it's possible if
you try to start a relay where secret_onion_key_ntor is the same as
secret_onion_key_ntor.old.
Fixes bug 30916; bugfix on 0.2.4.8-alpha when ntor keys were
introduced.
2019-09-18 11:14:45 -04:00
1e9488f2fd
Extract expressions in construct_ntor_key_map()
...
No behavioral change here: this is just refactoring.
2019-09-18 11:12:43 -04:00
d6d3e829dd
Merge branch 'maint-0.4.1'
2019-09-18 08:07:56 -04:00
70bcff6010
Merge branch 'bug31772_041' into maint-0.4.1
2019-09-18 08:07:50 -04:00
5f00c03ed0
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:28:38 -04:00
9e674d0eb4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:28:37 -04:00
02840169d8
Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
2019-09-17 21:28:29 -04:00
25af8ada30
Correct the syntax description for the MAPADDRESS command.
...
In 0.4.1.1-alpha I introduced a bug where we would require and
ignore a single positional argument.
Fixes bug 31772.
2019-09-17 19:26:45 -04:00
a3342b382a
Bump version to 0.4.1.6
2019-09-17 19:11:56 -04:00
c6f7943269
Merge branch 'bug31570_041' into maint-0.4.1
2019-09-17 19:04:25 -04:00
50f981719f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:58:44 -04:00
ef35435584
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 18:58:43 -04:00
dc41e6a80c
Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
2019-09-17 18:58:06 -04:00
cec42be570
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:56:52 -04:00
ab74c3560a
Merge branch 'ticket31552_041' into maint-0.4.1
2019-09-17 18:54:05 -04:00
2d744de355
Correct a comment in channel_tls_process_cell.
2019-09-17 11:42:19 -04:00
7f5c6a603c
Move PROCESS_CELL macros outside of channel_tls_process_cell().
...
These macros are used in multiple functions, and as such really
don't belong within a single function.
Also #undef them once we are done with them.
This change makes practracker pass again.
2019-09-17 11:40:14 -04:00
75d3c08219
bump to 0.4.2.1-alpha-dev
2019-09-17 11:36:43 -04:00
4d7ce27105
Merge branch 'bug31107_041' into bug31107_master
2019-09-17 09:16:53 -04:00
6ee19e57c2
Merge branch 'bug31107_040' into bug31107_041
2019-09-17 09:16:52 -04:00
da8ba5010b
Merge branch 'bug31107_035' into bug31107_040
2019-09-17 09:16:52 -04:00
7589995111
Merge branch 'maint-0.3.5' into bug31107_035
2019-09-17 09:16:52 -04:00
3c97ab3c24
Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.
...
We previously used tor_fragile_assert() to declare that this case
could not happen: VERSIONS cells are always supposed to be
variable-sized, right?
This is incorrect, though. On a v1 link protocol connection, all
cells are fixed-sized. There aren't supposed to be any VERSIONS
cells with this version of the protocol, but apparently, somebody
was messing up. (The v1 link protocol is obsolete, so probably the
implementer responsible didn't mean to be using it.)
Fixes bug 31107. Bugfix on 0.2.4.4-alpha, when we introduced a
tor_fragile_assert() for this case.
2019-09-17 09:13:25 -04:00
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
a28a682a1f
bump version to 0.4.2.1-alpha
2019-09-16 16:24:24 -04:00
68a0106bf3
Run "make autostyle" and fix wide lines.
2019-09-16 13:27:42 -04:00
8ad419744f
On windows, allow failures in test_parseconf.sh
...
There seems to be some unreliability issue with this test on
appveyor.
Addresses ticket 31757; This isn't a final fix for this issue, but
it should make CI pass.
2019-09-16 11:01:03 -04:00
a1694b7363
Fix a shellcheck warning in test_parseconf.sh.
...
I wonder why this didn't show up before.
2019-09-16 09:22:43 -04:00
cd72850e08
Merge branch 'tor-github/pr/1316'
2019-09-16 15:22:18 +03:00
5ec751b38b
Merge branch 'tor-github/pr/1324'
2019-09-16 15:21:28 +03:00
a1192b6b4a
Merge branch 'tor-github/pr/1273'
2019-09-16 15:20:25 +03:00
George Kadianakis
teor
Roger Dingledine
Nick Mathewson