5c03bb7c0c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-01 12:13:40 -05:00
3bca705c54
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-01 12:13:40 -05:00
f97f301b5b
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-01 12:13:39 -05:00
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
d3048a8f5b
Merge branch 'maint-0.3.1' into release-0.3.1
2017-12-01 09:35:43 -05:00
7fae562a4d
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-12-01 09:35:25 -05:00
6e3ec8222c
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" merge to avoid version bump.
2017-12-01 09:35:16 -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
a12dbbd882
bump to 0.3.1.9-dev
2017-12-01 09:34:20 -05:00
1983068ba9
bump to 0.3.0.13-dev
2017-12-01 09:34:09 -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
9703b41480
copy changelog to releasenotes
2017-12-01 09:16:03 -05:00
7ae9e92ffb
Add changes file for #23862 .
2017-12-01 14:14:01 +02:00
1c9f063486
Remove a duplicate call to update_microdesc_downloads()
...
This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
2017-12-01 14:13:22 +02:00
210f0c24f0
Update entry guard state whenever we download a consensus.
...
Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.
Fixes #23862 on 0.3.0.1-alpha
2017-12-01 14:09:29 +02:00
43c34dfca0
Add changes file for #23862 .
2017-12-01 14:06:36 +02:00
6bd64e8212
Remove a duplicate call to update_microdesc_downloads()
...
This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
2017-12-01 14:06:32 +02:00
8276a0ab85
Update entry guard state whenever we download a consensus.
...
Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.
Fixes #23862 on 0.3.0.1-alpha
2017-12-01 14:06:28 +02:00
727d3f1b5e
0.3.1.9 changelog.
2017-11-30 14:59:31 -05:00
94ad23deb2
Merge branch 'maint-0.3.1' into release-0.3.1
2017-11-30 12:28:39 -05:00
4ebd436541
version bump to 0.3.1.9
2017-11-30 12:25:48 -05:00
6b9c2ac23e
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" to avoid version bump.
2017-11-30 12:25:07 -05:00
f2ecdeb724
version bump to 0.3.0.13
2017-11-30 12:25:01 -05:00
8f36104574
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:24:13 -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
d8d52f2b73
Merge branch 'maint-0.3.1' into release-0.3.1
2017-11-30 12:07:59 -05:00
ee48eb1eb5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 12:07:59 -05:00
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
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
d459c08b7d
Merge branch 'trove-2017-012_030' into maint-0.3.0
2017-11-30 12:07:43 -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
766d0a2d98
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 11:48:12 -05:00
500f04a74e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 11:48:12 -05:00
14746dfba2
Merge branch 'maint-0.3.1' into release-0.3.1
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
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
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
George Kadianakis
David Goulet