47e87f2be2
Merge branch 'maint-0.2.9' into release-0.2.9
2017-12-01 09:35:43 -05:00
495db72c1e
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump.
2017-12-01 09:35:07 -05:00
dc3890439f
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" merge to avoid version bump.
2017-12-01 09:34:47 -05:00
73869c99a0
bump to 0.2.9.14-dev
2017-12-01 09:34:00 -05:00
8f858de819
bump to 0.2.8.17-dev
2017-12-01 09:33:51 -05:00
162a087e5f
bump to 0.2.5.16-dev
2017-12-01 09:33:41 -05:00
e8cda91441
copy changelog to releasenotes
2017-12-01 09:14:54 -05:00
3f9bd01bf5
changelog for 0.2.9.14
2017-11-30 15:15:01 -05:00
c4f0b33e43
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-30 12:28:39 -05:00
16c9cfd658
version bump to 0.2.9.14
2017-11-30 12:24:07 -05:00
1fd6e25522
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump.
2017-11-30 12:22:38 -05:00
6ee4472544
version bump to 0.2.8.17
2017-11-30 12:22:32 -05:00
2e219291be
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" to avoid version bump
2017-11-30 12:21:36 -05:00
6bda6777c1
bump to 0.2.5.16
2017-11-30 12:19:48 -05:00
88dd6445ed
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-30 12:07:59 -05:00
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
52d7af631c
Merge branch 'trove-2017-010_029' into maint-0.2.9
2017-11-30 12:07:26 -05:00
f49876d66e
Merge branch 'trove-2017-012_025' into maint-0.2.5
2017-11-30 12:06:21 -05:00
08ce39fb0f
Merge branch 'trove-2017-011_025' into maint-0.2.5
2017-11-30 12:06:17 -05:00
a6a0c7a4ec
Merge branch 'trove-2017-009_025' into maint-0.2.5
2017-11-30 12:05:59 -05:00
75509dc827
Fix changes file
2017-11-30 11:52:40 -05:00
c8f3af4cec
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-30 11:48:12 -05:00
072e194a15
Merge branch 'bug21394_029' into maint-0.2.9
2017-11-30 11:48:06 -05:00
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
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
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
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
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
c9a3525c70
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-27 09:09:34 -05:00
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-27 09:09:34 -05:00
25c90230be
Add bastet's ipv6 address
...
Implements ticket 24394
2017-11-27 09:09:16 -05:00
e5cf65e8ea
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-18 11:03:16 -05:00
53c3174ee4
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-18 11:01:43 -05:00
d388f9d879
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-18 11:01:33 -05:00
831d3b794d
Merge branch 'ticket18329_minimal_025' into maint-0.2.5
2017-11-18 11:00:45 -05:00
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
b84815881f
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 20:36:04 -05:00
1b9bb2c847
Merge branch 'bug22895_027' into maint-0.2.9
2017-11-13 20:35:59 -05:00
dbb9ec494f
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 12:57:58 -05:00
543fd89fb7
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-13 12:57:58 -05:00
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
97c3fac6d4
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 11:18:02 -05:00
ab415ae950
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
2017-11-13 11:17:58 -05:00
420e8737b4
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 11:15:50 -05:00
666653758d
Merge branch 'bug8185_025' into maint-0.2.9
2017-11-13 11:15:47 -05:00
15179a3e01
Merge branch 'maint-0.2.9' into release-0.2.9
2017-11-13 11:13:22 -05:00
c928fb988a
Merge branch 'ticket21953_029' into maint-0.2.9
2017-11-13 11:13:18 -05:00
9666c620d5
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-11 12:23:33 -05:00
c9b76a12f5
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-11 12:23:33 -05:00
Nick Mathewson
David Goulet
Sebastian Hahn