Nick Mathewson
c3e94a8ccd
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 21:26:32 -04:00
Nick Mathewson
a1f97bb253
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 21:26:31 -04:00
Nick Mathewson
50b45c43eb
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-09-17 21:26:31 -04:00
Nick Mathewson
967460389a
Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9
2019-09-17 21:26:17 -04:00
Nick Mathewson
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
Nick Mathewson
c6f7943269
Merge branch 'bug31570_041' into maint-0.4.1
2019-09-17 19:04:25 -04:00
Nick Mathewson
50f981719f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:58:44 -04:00
Nick Mathewson
ef35435584
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-09-17 18:58:43 -04:00
Nick Mathewson
dc41e6a80c
Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
2019-09-17 18:58:06 -04:00
Nick Mathewson
cec42be570
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-09-17 18:56:52 -04:00
Nick Mathewson
ab74c3560a
Merge branch 'ticket31552_041' into maint-0.4.1
2019-09-17 18:54:05 -04:00
Nick Mathewson
4d7ce27105
Merge branch 'bug31107_041' into bug31107_master
2019-09-17 09:16:53 -04:00
Nick Mathewson
6ee19e57c2
Merge branch 'bug31107_040' into bug31107_041
2019-09-17 09:16:52 -04:00
Nick Mathewson
da8ba5010b
Merge branch 'bug31107_035' into bug31107_040
2019-09-17 09:16:52 -04:00
Nick Mathewson
7589995111
Merge branch 'maint-0.3.5' into bug31107_035
2019-09-17 09:16:52 -04:00
Nick Mathewson
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
Nick Mathewson
1f0848e0b6
Fold new entries into 0.4.2.1-alpha changelog
2019-09-17 08:00:24 -04:00
George Kadianakis
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
Daniel Pinto
619178bb3a
Fix add_c_file.py script to support paths starting with ./ #31336
2019-09-16 22:57:20 +01:00
Nick Mathewson
7cd68b04de
Fold one more entry into changelog.
2019-09-16 12:50:56 -04:00
George Kadianakis
9877423736
Merge branch 'tor-github/pr/1312'
2019-09-16 19:44:33 +03:00
Nick Mathewson
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
George Kadianakis
cd72850e08
Merge branch 'tor-github/pr/1316'
2019-09-16 15:22:18 +03:00
George Kadianakis
5ec751b38b
Merge branch 'tor-github/pr/1324'
2019-09-16 15:21:28 +03:00
George Kadianakis
a1192b6b4a
Merge branch 'tor-github/pr/1273'
2019-09-16 15:20:25 +03:00
George Kadianakis
bdd17da9fd
Merge branch 'tor-github/pr/1318'
2019-09-16 15:19:38 +03:00
Nick Mathewson
98ab3817a8
Add a changes file for ticket 31637.
2019-09-14 19:00:41 -04:00
David Goulet
286b129b09
Merge branch 'tor-github/pr/1319'
2019-09-12 13:53:59 -04:00
David Goulet
c39c9ce26b
Merge branch 'tor-github/pr/1285'
2019-09-12 13:47:09 -04:00
George Kadianakis
028733e8b6
Merge branch 'tor-github/pr/1303'
2019-09-12 18:09:35 +03:00
Nick Mathewson
0327f9a075
Merge branch 'ticket31687_035' into ticket31687_040
2019-09-12 09:51:04 -04:00
Nick Mathewson
87944cecfc
Merge remote-tracking branch 'tor-github/pr/1300'
2019-09-12 08:50:09 -04:00
Nick Mathewson
c7cbe64463
Changes file for ticket31626 (confparse.[ch] move)
2019-09-11 10:25:27 -04:00
David Goulet
41261c3b5c
Merge branch 'tor-github/pr/1296'
2019-09-11 09:42:31 -04:00
Nick Mathewson
d545fe1992
Changes file for 31625 (config flag refactor)
2019-09-11 09:42:19 -04:00
David Goulet
049705fc1c
Merge branch 'tor-github/pr/1311'
2019-09-11 09:36:28 -04:00
George Kadianakis
3b32f2508c
Merge branch 'tor-github/pr/1307'
2019-09-11 16:19:21 +03:00
Nick Mathewson
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
Nick Mathewson
e7565855c0
Merge branch 'ticket31578' into ticket31578_merged
2019-09-11 08:59:29 -04:00
Nick Mathewson
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
, a.k.a svn:r136.
2019-09-10 19:01:32 -04:00
Nick Mathewson
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
Nick Mathewson
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
teor
51b792b000
scripts: Allow git-push-all.sh to be run from any directory
...
Closes 31678.
2019-09-10 12:10:28 +10:00
teor
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
teor
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
David Goulet
409df19b5a
build: The <sys/sysctl.h> is now deprecated on Linux
...
Closes #31673
2019-09-09 17:07:08 -04:00
David Goulet
484710f25b
build: The <sys/sysctl.h> is now deprecated on Linux
...
Closes #31673
2019-09-09 17:05:23 -04:00
David Goulet
796a9b37ea
Merge branch 'tor-github/pr/1264'
2019-09-09 14:53:12 -04:00
Nick Mathewson
a642a4cbd7
Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged
2019-09-09 11:10:53 -04:00
David Goulet
1e7c7870e8
Merge branch 'tor-github/pr/1287'
2019-09-09 10:51:19 -04:00