b4aeeb77ba
Merge advice from this_not_that.md in torguts repo into our main coding standard doc
2019-09-25 17:15:12 +03:00
7157d80c6f
Merge branch 'tor-github/pr/1337'
2019-09-25 14:19:49 +03:00
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
6677eae579
Merge branch 'tor-github/pr/1355'
2019-09-25 14:17:03 +03:00
6712fb9e27
Merge branch 'tor-github/pr/1353'
2019-09-25 14:16:28 +03:00
2199629648
Merge branch 'tor-github/pr/1345'
2019-09-25 14:14:30 +03:00
e77ad795c6
Merge branch 'tor-github/pr/1322'
2019-09-25 14:13:44 +03:00
99f75373de
Merge branch 'tor-github/pr/1309'
2019-09-25 14:12:42 +03:00
0c07cd24d4
changes: file for 31839
2019-09-24 15:22:57 +10: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
102546f99f
doc: Document the signal-safe log behaviour in the tor man page
...
Part of 31389.
2019-09-24 15:03:17 +10:00
22c33ea7f7
practracker: Fix a typo in the usage message
...
Fixes bug 31828; bugfix on 0.4.2.1-alpha.
2019-09-24 14:37:43 +10:00
c7c849bba8
configure: Explain --disable-module-dirauth better
...
Explain what the optional Directory Authority module is, and what
happens when it is disabled.
Fixes bug 31825; bugfix on 0.3.4.1-alpha.
2019-09-24 11:29:22 +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
6100378c29
changes file for microdesc_parse refactoring.
2019-09-19 14:37:24 -04:00
2e1989dacc
Remove practracker exception for microdesc parsing function
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
e6c5b248ae
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump
2019-09-19 08:52:42 -04:00
6f3f93d86c
bump to 0.4.1.6-dev
2019-09-19 08:52:15 -04:00
b01bd73d92
Copy 0.4.1.6 block into changelog/releasenotes in master
2019-09-19 08:38:50 -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
387cfccee4
Add a coccinelle script to look for {inc,dec}rements in log_debug
...
We want to forbid this pattern since, unlike the other log_*()
macros, log_debug() conditionally evaluates its arguments only if
debug-level logging is enabled. Thus, a call to
log_debug("%d", x++);
will only increment x if debugging logs are enabled, which is
probably not what the programmer intended.
One bug caused by this pattern was #30628 .
This script detects log_debug( ) calls with any of E++, E--, ++E,
or --E in their arguments, where E is an arbitrary expression.
Closes ticket 30743.
2019-09-18 13:43:42 -04: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
82ad63ef40
changes file for 31338
2019-09-18 10:28:33 -04:00
1c67d261d5
practracker: Integration test for --list-overbroad
...
Make sure that we list overbroad exceptions, and nothing else
2019-09-18 10:28:33 -04:00
d1ffac3f8a
practracker: An exception is "used" even when it is violated.
...
The purpose of tracking whether an exception is used is so that we
can tell whether it is overbroad. This means that an _underbroad_
exception is still a used one. Fixes bug 31338.
2019-09-18 10:28:33 -04:00
25d55fa01e
Practracker: do not list problems when told to --list-overbroad.
2019-09-18 10:28:33 -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
7225cfc586
Merge branch 'maint-0.4.1'
2019-09-17 21:28:38 -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
2013e63acc
Merge branch 'maint-0.4.1'
2019-09-17 21:26:32 -04:00
c3e94a8ccd
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:26:32 -04:00
a1f97bb253
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:26:31 -04:00
50b45c43eb
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-09-17 21:26:31 -04:00
rl1987
George Kadianakis
teor
Roger Dingledine
Nick Mathewson