d4f08c74fe
Merge branch 'maint-0.3.1'
2017-07-05 11:19:03 -04:00
0f97f963e3
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-07-05 11:19:03 -04:00
8bc70a2ad2
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-07-05 11:19:03 -04:00
bb97f680e7
Merge branch 'bug22801_028' into maint-0.2.9
2017-07-05 11:18:59 -04:00
e04cc7e27f
Merge branch 'maint-0.3.1'
2017-07-05 11:16:51 -04:00
e88aa98451
Merge branch 'teor-bug22797-025' into maint-0.3.1
2017-07-05 11:16:30 -04:00
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
cd77ea782e
Merge branch 'neena-fix-1667'
2017-07-05 11:01:36 -04:00
03b6cfd591
Extract "not an HTTP proxy" messages.
2017-07-05 11:01:17 -04:00
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
17bd118b4c
Add test that parses a hardcoded v2 descriptor.
2017-07-05 10:14:26 -04:00
13ccca69f1
Merge branch 'onionskin_refactor_2'
2017-07-05 10:01:48 -04:00
c79e286386
Use the proper syscall in sandbox error messages
...
Fixes #22750 .
2017-07-05 09:56:28 -04:00
3402b14089
Merge remote-tracking branch 'asn/ticket22727_032_02'
2017-07-05 09:49:12 -04:00
b6c8530fc3
Merge remote-tracking branch 'dgoulet/ticket22726_032_02'
2017-07-05 09:36:31 -04:00
943d284752
CREATE_FAST is for when you don't know the onion key
...
it isn't (anymore) for when you think you can get away with saving some
crypto operations.
2017-07-03 17:20:52 -04:00
69fba1f2cd
better comments and mild refactoring
2017-07-03 17:13:08 -04:00
9b44e2e50e
Document the new functions from the refactor
2017-07-03 16:54:41 -04:00
2814b86875
Reindent the functions split from circuit_send_next_onion_skin().
...
This is a whitespace change only.
2017-07-03 16:54:41 -04:00
935f84bd40
Split circuit_send_next_onion_skin() into its three main cases.
...
This commit is designed to have a very small diff. Therefore,
the indentation is wrong. The next commit will fix that.
2017-07-03 16:54:41 -04:00
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
0fe7c42e0e
general formatting / whitespace / typo fixes
2017-07-01 17:56:06 -04:00
83dc072e67
Bump version to 0.3.1.4-alpha-dev
2017-06-29 18:45:49 -04:00
d9427c00df
bump to 0.3.0.9-dev
2017-06-29 18:44:43 -04:00
a53573559f
Bump 0.3.1 to 0.3.1.4-alpha
2017-06-29 16:36:50 -04:00
98ffb2e722
Update maint-0.3.0 to 0.3.0.9
2017-06-29 16:35:40 -04:00
71b9f4f0bb
Merge branch 'maint-0.3.1'
2017-06-29 15:57:49 -04:00
1712dc98b0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-29 15:57:48 -04:00
52c4440c48
Merge branch 'trove-2017-006' into maint-0.3.0
2017-06-29 15:57:42 -04:00
3781678a3c
Merge branch 'maint-0.3.1'
2017-06-29 11:38:06 -04:00
31a08ba26f
Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1
2017-06-29 11:34:06 -04:00
2c718c1a12
Merge branch 'maint-0.3.1'
2017-06-29 10:43:50 -04:00
bb5968cae1
Merge branch 'ticket22684'
2017-06-29 10:16:15 -04:00
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
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
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
de5f0d8ba7
Replace crash on missing handle in consdiffmgr with nonfatal assert
...
Attempts to mitigate 22752.
2017-06-28 14:21:21 -04:00
4c21d4ef7a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-28 14:03:23 -04:00
ec9c6d7723
Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
2017-06-28 14:03:20 -04:00
4060253749
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
2017-06-28 13:57:54 -04:00
75c6fdd286
whitespace fix
2017-06-28 13:53:52 -04:00
e84127d99e
Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
2017-06-28 13:48:52 -04:00
01404d7c52
Merge branch 'maint-0.3.1'
2017-06-28 12:25:09 -04:00
551ad20c43
nodelist: Make HSv3 protover magic numbers a bit more readable.
2017-06-28 18:32:32 +03:00
c239b2fc9c
Fix crash in LZMA module when the Sandbox is enabled.
...
This patch fixes a crash in our LZMA module where liblzma will allocate
slightly more data than it is allowed to by its limit, which leads to a
crash.
See: https://bugs.torproject.org/22751
2017-06-28 10:00:24 -04:00
f85c1874ad
ed25519: Add tests blinding bad ed25519 pubkeys.
2017-06-28 16:02:21 +03:00
0269e4ffba
ed25519: Also check that retval in the ref10 implementation.
2017-06-28 14:58:22 +03:00
0d9873ac0d
ed25519: Check retval of unpack_negative_vartime in donna.
2017-06-28 14:58:22 +03:00
559195ea82
Merge branch 'maint-0.3.1'
2017-06-27 18:28:38 -04:00
0a4af86335
Return "304 not modified" if a client already have the most recent consensus.
...
This makes our directory code check if a client is trying to fetch a
document that matches a digest from our latest consensus document.
See: https://bugs.torproject.org/22702
2017-06-27 18:25:48 -04:00
Nick Mathewson
teor
George Kadianakis
cypherpunks
Roger Dingledine
Alexander Færøy