Nick Mathewson
b47249e0bb
Mention TROVE-2017-007 in changes file for 22789
2017-07-07 10:51:25 -04:00
Karsten Loesing
b6acfa491e
Update geoip and geoip6 to the July 4 2017 database.
2017-07-07 16:27:54 +02:00
Nick Mathewson
9919638e98
Fix a wide line from 22207
2017-07-05 17:37:06 -04:00
Nick Mathewson
2251667ff2
Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
2017-07-05 17:00:43 -04:00
Nick Mathewson
55777b3ff9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 16:11:48 -04:00
Nick Mathewson
15b13578e8
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 16:11:48 -04:00
Nick Mathewson
dfc0614840
Only disable -Wfloat-conversion on mingw when it exists.
...
The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion
didn't exist in every relevant mingw; it was added in GCC 4.9.x some
time, if the documentation can be trusted.
Bug not in any released version of tor.
2017-07-05 16:10:45 -04:00
Nick Mathewson
9383fa3851
Fix mixed-sign comparison warning in fix for 22797.
2017-07-05 15:56:57 -04:00
Nick Mathewson
759154b1ad
Fix unit test memory leak in certs_ok_ed25519.
...
Fixes bug 22803; bugfix on 0.3.0.1-alpha.
2017-07-05 15:42:25 -04:00
Nick Mathewson
546f5b364b
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 13:43:31 -04:00
Nick Mathewson
5434b2451e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 13:43:31 -04:00
Nick Mathewson
32c0066e4b
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-07-05 13:43:21 -04:00
Nick Mathewson
5ff0f1ab9e
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-05 13:42:47 -04:00
Nick Mathewson
6cd6d488dc
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-05 13:42:37 -04:00
Nick Mathewson
f6420bceec
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-05 13:42:32 -04:00
Nick Mathewson
ff8c230d7c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-05 13:42:26 -04:00
Nick Mathewson
0ee15c92d5
Merge branch 'bug22789_024' into maint-0.2.4
2017-07-05 13:41:27 -04:00
Nick Mathewson
16d2bce893
Allow setsockopt(IPV6_V6ONLY) in sandbox.
...
Fixes bug 20247. We started setting V6ONLY in 0.2.3.13-alpha and
added the sandbox on 0.2.5.1-alpha.
2017-07-05 13:09:21 -04:00
Nick Mathewson
8bc70a2ad2
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 11:19:03 -04:00
Nick Mathewson
0f97f963e3
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 11:19:03 -04:00
Nick Mathewson
bb97f680e7
Merge branch 'bug22801_028' into maint-0.2.9
2017-07-05 11:18:59 -04:00
Nick Mathewson
e88aa98451
Merge branch 'teor-bug22797-025' into maint-0.3.1
2017-07-05 11:16:30 -04:00
teor
878e0d45a5
Always allow extra file descriptors when setting the connection maximum
...
When setting the maximum number of connections allowed by the OS,
always allow some extra file descriptors for other files.
Fixes bug 22797; bugfix on 0.2.0.10-alpha.
2017-07-05 11:15:10 -04:00
Nick Mathewson
d011126467
Update fuzzing_include_am to include updates from include.am
2017-07-03 13:24:57 -04:00
Nick Mathewson
bb3f74e66b
Fix assertion failure related to openbsd strtol().
...
Fixes bug 22789; bugfix on 0.2.3.8-alpha.
2017-07-03 11:22:27 -04:00
Nick Mathewson
5361032219
Fix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64.
...
We just have to suppress these warnings: Mingw's math.h uses gcc's
__builtin_choose_expr() facility to declare isnan, isfinite, and
signbit. But as implemented in at least some versions of gcc,
__builtin_choose_expr() can generate type warnings even from
branches that are not taken.
Fixes bug 22801; bugfix on 0.2.8.1-alpha.
2017-07-03 10:59:31 -04:00
Nick Mathewson
83dc072e67
Bump version to 0.3.1.4-alpha-dev
2017-06-29 18:45:49 -04:00
Nick Mathewson
6f2657dbcf
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-06-29 18:44:53 -04:00
Nick Mathewson
d9427c00df
bump to 0.3.0.9-dev
2017-06-29 18:44:43 -04:00
Nick Mathewson
a53573559f
Bump 0.3.1 to 0.3.1.4-alpha
2017-06-29 16:36:50 -04:00
Nick Mathewson
1494fa0d3b
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-06-29 16:36:05 -04:00
Nick Mathewson
98ffb2e722
Update maint-0.3.0 to 0.3.0.9
2017-06-29 16:35:40 -04:00
Nick Mathewson
1712dc98b0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-29 15:57:48 -04:00
Nick Mathewson
52c4440c48
Merge branch 'trove-2017-006' into maint-0.3.0
2017-06-29 15:57:42 -04:00
Nick Mathewson
31a08ba26f
Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1
2017-06-29 11:34:06 -04:00
Nick Mathewson
88666d0482
Adjust unit tests to account for fix to bug 22753.
...
Our mock network put all the guards on the same IPv4 address, which
doesn't fly when we start applying EnforceDistinctSubnets. So in
this commit, I disable EnforceDistinctSubnets when running the old
guard_restriction_t test.
This commit also adds a regression test for #22753 .
2017-06-29 10:11:21 -04:00
Nick Mathewson
665baf5ed5
Consider the exit family when applying guard restrictions.
...
When the new path selection logic went into place, I accidentally
dropped the code that considered the _family_ of the exit node when
deciding if the guard was usable, and we didn't catch that during
code review.
This patch makes the guard_restriction_t code consider the exit
family as well, and adds some (hopefully redundant) checks for the
case where we lack a node_t for a guard but we have a bridge_info_t
for it.
Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006
and CVE-2017-0377.
2017-06-29 09:57:00 -04:00
Nick Mathewson
0ac8f0bde9
Changes file for bug22752 diagnostics
2017-06-28 14:27:52 -04:00
Nick Mathewson
a088a08eeb
Log real error message when unable to remove a storagedir file
...
Attempts to help diagnose 22752.
2017-06-28 14:24:27 -04:00
Nick Mathewson
de5f0d8ba7
Replace crash on missing handle in consdiffmgr with nonfatal assert
...
Attempts to mitigate 22752.
2017-06-28 14:21:21 -04:00
Nick Mathewson
4c21d4ef7a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-28 14:03:23 -04:00
Nick Mathewson
912f366bd5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-28 14:03:23 -04:00
Nick Mathewson
ec9c6d7723
Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
2017-06-28 14:03:20 -04:00
Nick Mathewson
aa5af6a238
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-28 13:58:37 -04:00
Nick Mathewson
054d7c57f6
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-28 13:58:37 -04:00
Nick Mathewson
4060253749
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
2017-06-28 13:57:54 -04:00
Nick Mathewson
c57a119eb8
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid taking redundant ws fix
2017-06-28 13:54:00 -04:00
Nick Mathewson
75c6fdd286
whitespace fix
2017-06-28 13:53:52 -04:00
Nick Mathewson
6b2c88649d
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"Ours" merge to avoid taking backport of 21969
2017-06-28 13:49:14 -04:00
Nick Mathewson
e84127d99e
Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
2017-06-28 13:48:52 -04:00
