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
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
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
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
87944cecfc
Merge remote-tracking branch 'tor-github/pr/1300'
2019-09-12 08:50:09 -04:00
c7cbe64463
Changes file for ticket31626 (confparse.[ch] move)
2019-09-11 10:25:27 -04:00
41261c3b5c
Merge branch 'tor-github/pr/1296'
2019-09-11 09:42:31 -04:00
d545fe1992
Changes file for 31625 (config flag refactor)
2019-09-11 09:42:19 -04:00
049705fc1c
Merge branch 'tor-github/pr/1311'
2019-09-11 09:36:28 -04:00
3b32f2508c
Merge branch 'tor-github/pr/1307'
2019-09-11 16:19:21 +03:00
0891a31ad3
madvise: tolerate EINVAL and ENOSYS when minherit fails
...
These errors can occur if we are built on a system with support for
madvise(MADV_NOFORK) but then we are run on a system whose kernel
does not support that flag.
If the error is something that we don't tolerate at all, we now log
it before crashing.
Fixes bug 31696. I am calling this a bugfix on 0.4.1.1-alpha, where
we actually started using the map_anon code.
This is similar to, but not the same as, the fix for #31570 .
2019-09-11 09:13:50 -04:00
e7565855c0
Merge branch 'ticket31578' into ticket31578_merged
2019-09-11 08:59:29 -04:00
9d60495903
Use strtod, not atof, for parsing doubles in the configuration.
...
This lets us detect erroneous doubles, which previously we could not
do.
Fixes bug 31475; bugfix on commit 00a9e3732e
2019-09-10 19:01:32 -04:00
97f7efa9e3
pf: when extracting an IPv6 address, make sure we got an IPv6 address
...
Our code assumes that when we're configured to get IPv6 addresses
out of a TRANS_PF transparent proxy connection, we actually will.
But we didn't check that, and so FreeBSD started warning us about a
potential NULL pointer dereference.
Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was
added.
2019-09-10 11:07:25 -04:00
51475aee57
fp.c: Suppress float-conversion warnings on FreeBSD.
...
We used to do this on Windows only, but it appears to affect
multiple platforms when building with certain versions of GCC, and a
common pattern for defining the floating-point classifier functions.
Fixes part of 31687. I'm calling this a bugfux on 31687, when we
started suppressing these warnings on Windows.
2019-09-10 10:55:44 -04:00
51b792b000
scripts: Allow git-push-all.sh to be run from any directory
...
Closes 31678.
2019-09-10 12:10:28 +10:00
987768b077
Merge branch 'bug31615_041' into bug31615_master
...
Merged modified lines from bug31615_041, and unmodified lines
from master.
2019-09-10 09:03:37 +10:00
7e22d99346
Merge branch 'bug31615_040' into bug31615_041
...
Merged modified lines from bug31615_040, and unmodified lines
from maint-0.4.1.
2019-09-10 08:43:13 +10:00
409df19b5a
build: The <sys/sysctl.h> is now deprecated on Linux
...
Closes #31673
2019-09-09 17:07:08 -04:00
484710f25b
build: The <sys/sysctl.h> is now deprecated on Linux
...
Closes #31673
2019-09-09 17:05:23 -04:00
George Kadianakis
Nick Mathewson
David Goulet
teor