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
6712fb9e27
Merge branch 'tor-github/pr/1353'
2019-09-25 14:16:28 +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
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
6100378c29
changes file for microdesc_parse refactoring.
2019-09-19 14:37:24 -04: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
82ad63ef40
changes file for 31338
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
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
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
967460389a
Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9
2019-09-17 21:26:17 -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
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
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
1f0848e0b6
Fold new entries into 0.4.2.1-alpha changelog
2019-09-17 08:00:24 -04:00
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
7cd68b04de
Fold one more entry into changelog.
2019-09-16 12:50:56 -04:00
9877423736
Merge branch 'tor-github/pr/1312'
2019-09-16 19:44:33 +03:00
cbd3b01863
Start a changelog for 0.4.2.1-alpha
...
This commit sorts the changes files using sortChanges, and inserts
them into a changelog entry.
2019-09-16 08:32:01 -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
bdd17da9fd
Merge branch 'tor-github/pr/1318'
2019-09-16 15:19:38 +03:00
98ab3817a8
Add a changes file for ticket 31637.
2019-09-14 19:00:41 -04:00
286b129b09
Merge branch 'tor-github/pr/1319'
2019-09-12 13:53:59 -04:00
c39c9ce26b
Merge branch 'tor-github/pr/1285'
2019-09-12 13:47:09 -04:00
028733e8b6
Merge branch 'tor-github/pr/1303'
2019-09-12 18:09:35 +03:00
0327f9a075
Merge branch 'ticket31687_035' into ticket31687_040
2019-09-12 09:51:04 -04:00
rl1987
George Kadianakis
teor
Nick Mathewson
David Goulet