Nick Mathewson
d3b7a2bd27
rename changes file
2017-12-12 09:13:05 -05:00
Nick Mathewson
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
Nick Mathewson
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
Nick Mathewson
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
Nick Mathewson
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
Nick Mathewson
2ea573ece8
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:54:14 -05:00
Nick Mathewson
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:54:14 -05:00
Nick Mathewson
bc1ea4f470
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:54:11 -05:00
Nick Mathewson
f5d4bdf305
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
2017-12-11 16:53:02 -05:00
Nick Mathewson
7fcb222ab7
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:51:58 -05:00
Nick Mathewson
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -05:00
Nick Mathewson
c55a054236
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
2017-12-11 16:41:28 -05:00
Nick Mathewson
953a8f8510
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-01 12:13:40 -05:00
Nick Mathewson
3bca705c54
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-01 12:13:40 -05:00
Nick Mathewson
f97f301b5b
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-01 12:13:39 -05:00
Nick Mathewson
461e34bb3d
Fix a clang compilation warning in rendservice.c
...
Fixes bug 24480; bugfix on 0.2.5.16.
2017-12-01 12:13:15 -05:00
George Kadianakis
7ae9e92ffb
Add changes file for #23862 .
2017-12-01 14:14:01 +02:00
Nick Mathewson
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:07:59 -05:00
Nick Mathewson
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
Nick Mathewson
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
Nick Mathewson
d459c08b7d
Merge branch 'trove-2017-012_030' into maint-0.3.0
2017-11-30 12:07:43 -05:00
Nick Mathewson
52d7af631c
Merge branch 'trove-2017-010_029' into maint-0.2.9
2017-11-30 12:07:26 -05:00
Nick Mathewson
f49876d66e
Merge branch 'trove-2017-012_025' into maint-0.2.5
2017-11-30 12:06:21 -05:00
Nick Mathewson
08ce39fb0f
Merge branch 'trove-2017-011_025' into maint-0.2.5
2017-11-30 12:06:17 -05:00
Nick Mathewson
a6a0c7a4ec
Merge branch 'trove-2017-009_025' into maint-0.2.5
2017-11-30 12:05:59 -05:00
Nick Mathewson
75509dc827
Fix changes file
2017-11-30 11:52:40 -05:00
Nick Mathewson
766d0a2d98
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 11:48:12 -05:00
Nick Mathewson
072e194a15
Merge branch 'bug21394_029' into maint-0.2.9
2017-11-30 11:48:06 -05:00
David Goulet
6ab07419c8
Use local descriptor object to exclude self in path selection
...
TROVE-2017-12. Severity: Medium
When choosing a random node for a circuit, directly use our router
descriptor to exclude ourself instead of the one in the global
descriptor list. That list could be empty because tor could be
downloading them which could lead to not excluding ourself.
Closes #21534
2017-11-28 19:14:10 -05:00
David Goulet
91cee3c9e7
Guard: Don't pick ourselves as a possible Guard
...
TROVE-2017-12. Severity: Medium
Thankfully, tor will close any circuits that we try to extend to
ourselves so this is not problematic but annoying.
Part of #21534 .
2017-11-28 19:12:56 -05:00
David Goulet
3030741b5d
hs-v2: Remove any expiring intro from the retry list
...
TROVE-2017-13. Severity: High.
In the unlikely case that a hidden service could be missing intro circuit(s),
that it didn't have enough directory information to open new circuits and that
an intro point was about to expire, a use-after-free is possible because of
the intro point object being both in the retry list and expiring list at the
same time.
The intro object would get freed after the circuit failed to open and then
access a second time when cleaned up from the expiring list.
Fixes #24313
2017-11-28 18:41:29 -05:00
Nick Mathewson
1880a6a88e
Avoid asking for passphrase on junky PEM input
...
Fixes bug 24246 and TROVE-2017-011.
This bug is so old, it's in Matej's code. Seems to have been
introduced with e01522bbed
2017-11-27 15:25:03 -05:00
Nick Mathewson
2c0487ecfb
Handle NULL input to protover_compute_for_old_tor()
...
Fixes bug 24245; bugfix on 0.2.9.4-alpha. TROVE-2017-010.
2017-11-27 15:16:30 -05:00
Nick Mathewson
2834cc9c18
Fix length of replaycache-checked data.
...
This is a regression; we should have been checking only the
public-key encrypted portion. Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.
2017-11-27 15:12:19 -05:00
David Goulet
8be50ca3ea
relay: Change bandwidth stats interval to 24 hours
...
Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.
Closes #23856
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-27 10:00:40 -05:00
Nick Mathewson
b1c4ab0bec
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-27 09:09:34 -05:00
Nick Mathewson
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-27 09:09:34 -05:00
Sebastian Hahn
25c90230be
Add bastet's ipv6 address
...
Implements ticket 24394
2017-11-27 09:09:16 -05:00
Nick Mathewson
2d849716df
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-18 11:02:08 -05:00
Nick Mathewson
53c3174ee4
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-18 11:01:43 -05:00
Nick Mathewson
d388f9d879
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-18 11:01:33 -05:00
Nick Mathewson
95238eb917
Fix a traceback when closing a blocked connection "immediately".
...
When we close a connection via connection_close_immediately, we kill
its events immediately. But if it had been blocked on bandwidth
read/write, we could try to re-add its (nonexistent) events later
from connection_bucket_refill -- if we got to that callback before
we swept the marked connections.
Fixes bug 24167. Fortunately, this hasn't been a crash bug since we
introduced connection_check_event in 0.2.9.10, and backported it.
This is a bugfix on commit 89d422914a
2017-11-16 12:05:56 -05:00
Nick Mathewson
9f2efd02a1
Minimal implementation of bridge-distribution-request
...
Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.
This is done in lieu of a full backport of #18329 .
2017-11-13 20:44:51 -05:00
Nick Mathewson
50fbede459
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 20:36:04 -05:00
Nick Mathewson
1b9bb2c847
Merge branch 'bug22895_027' into maint-0.2.9
2017-11-13 20:35:59 -05:00
Nick Mathewson
fea5c8a015
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 12:57:58 -05:00
Nick Mathewson
543fd89fb7
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-13 12:57:58 -05:00
Nick Mathewson
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
Nick Mathewson
16bdb9e365
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-13 11:18:02 -05:00
Nick Mathewson
ab415ae950
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
2017-11-13 11:17:58 -05:00
