0fe7c42e0e
general formatting / whitespace / typo fixes
2017-07-01 17:56:06 -04:00
bbc1b3c1ae
Add 0.3.1.4-alpha to changelog
2017-06-29 18:48:06 -04:00
700ecce265
Add 0.3.0.9 to changelog and releasenotes
2017-06-29 18:47:24 -04:00
e0aa6bee4a
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-06-29 18:45:57 -04:00
83dc072e67
Bump version to 0.3.1.4-alpha-dev
2017-06-29 18:45:49 -04:00
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
d9427c00df
bump to 0.3.0.9-dev
2017-06-29 18:44:43 -04:00
fb33bcbcf0
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-06-29 16:36:58 -04:00
a53573559f
Bump 0.3.1 to 0.3.1.4-alpha
2017-06-29 16:36:50 -04:00
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
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
0ac8f0bde9
Changes file for bug22752 diagnostics
2017-06-28 14:27:52 -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
0f3084c4f2
Merge branch 'maint-0.3.1'
2017-06-28 14:03:23 -04:00
912f366bd5
Merge branch 'maint-0.3.0' into maint-0.3.1
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
aa5af6a238
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-06-28 13:58:37 -04:00
0c1586d1b8
Merge branch 'maint-0.3.1'
2017-06-28 13:58:37 -04:00
054d7c57f6
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-06-28 13:58:37 -04:00
4060253749
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
2017-06-28 13:57:54 -04:00
590cfe2b89
Merge branch 'maint-0.3.1'
2017-06-28 13:54:12 -04:00
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
75c6fdd286
whitespace fix
2017-06-28 13:53:52 -04:00
c520a2de3b
Merge branch 'maint-0.3.1'
2017-06-28 13:49:28 -04:00
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
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
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
a794fb7609
ed25519: Add changes file for #22746 .
2017-06-28 16:09:59 +03: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
2cd49d9ea6
Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1
2017-06-27 18:28:34 -04:00
09ae4fc583
Add changes file for bug #22702 .
...
See: https://bugs.torproject.org/22702
2017-06-27 18:25:48 -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
07f2940b45
Set published_out for consensus cache entries in spooled_resource_estimate_size().
...
This patch ensures that the published_out output parameter is set to the
current consensus cache entry's "valid after" field.
See: https://bugs.torproject.org/22702
2017-06-27 18:25:48 -04:00
733ce556ad
Merge branch 'asn_bug22006_final_squashed'
2017-06-27 18:21:46 -04:00
3f94041589
no newlines in log messages.
2017-06-27 18:21:35 -04:00
Roger Dingledine
Nick Mathewson
Alexander Færøy
George Kadianakis