Nick Mathewson
86eb63deb4
Merge remote-tracking branch 'public/bug19648'
2017-07-06 09:32:22 -04:00
Nick Mathewson
139799cdce
Merge branch 'bug20488_029_squashed'
2017-07-06 09:29:03 -04:00
Nick Mathewson
41fe94ef15
Improve warning message to stop implying nickname reg is a thing.
...
Closing ticket 20488.
2017-07-06 09:28:31 -04:00
Nick Mathewson
93bd60e5b0
Merge branch 'maint-0.3.1'
2017-07-05 17:00:46 -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
15fddaffd5
Merge branch 'maint-0.3.1'
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
546f5b364b
Merge branch 'maint-0.2.9' into maint-0.3.0
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
d4f08c74fe
Merge branch 'maint-0.3.1'
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
8bc70a2ad2
Merge branch 'maint-0.2.9' into maint-0.3.0
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
e04cc7e27f
Merge branch 'maint-0.3.1'
2017-07-05 11:16:51 -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
cd77ea782e
Merge branch 'neena-fix-1667'
2017-07-05 11:01:36 -04:00
Nick Mathewson
46e83477c1
Merge branch 'bug15554_032_01_squashed'
2017-07-05 10:15:24 -04:00
Nick Mathewson
78ac713d60
changes file for 15554
2017-07-05 10:15:17 -04:00
Nick Mathewson
13ccca69f1
Merge branch 'onionskin_refactor_2'
2017-07-05 10:01:48 -04:00
Nick Mathewson
ef56f073c1
changes file for 22804
2017-07-05 10:01:40 -04:00
Nick Mathewson
093f57cb16
changes file for bug 22750
2017-07-05 09:57:48 -04:00
cypherpunks
c79e286386
Use the proper syscall in sandbox error messages
...
Fixes #22750 .
2017-07-05 09:56:28 -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
71b9f4f0bb
Merge branch 'maint-0.3.1'
2017-06-29 15:57:49 -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
3781678a3c
Merge branch 'maint-0.3.1'
2017-06-29 11:38:06 -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
2c718c1a12
Merge branch 'maint-0.3.1'
2017-06-29 10:43:50 -04:00
Nick Mathewson
bb5968cae1
Merge branch 'ticket22684'
2017-06-29 10:16:15 -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
4c21d4ef7a
Merge branch 'maint-0.2.9' into maint-0.3.0
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
4060253749
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
2017-06-28 13:57:54 -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
Nick Mathewson
01404d7c52
Merge branch 'maint-0.3.1'
2017-06-28 12:25:09 -04:00
Alexander Færøy
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
George Kadianakis
a794fb7609
ed25519: Add changes file for #22746 .
2017-06-28 16:09:59 +03:00
Nick Mathewson
559195ea82
Merge branch 'maint-0.3.1'
2017-06-27 18:28:38 -04:00
Alexander Færøy
09ae4fc583
Add changes file for bug #22702 .
...
See: https://bugs.torproject.org/22702
2017-06-27 18:25:48 -04:00
Nick Mathewson
7fff6cfead
Merge branch 'asn_bug22006_final_squashed'
2017-06-27 17:19:08 -04:00
George Kadianakis
559658ff1c
ed25519: Add func that checks for torsion component in pubkeys.
...
See https://lists.torproject.org/pipermail/tor-dev/2017-April/012213.html .
2017-06-27 17:17:58 -04:00
Nick Mathewson
3483f7c003
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-06-27 11:04:44 -04:00
