Nick Mathewson
c9b3f6352f
Merge branch 'bug24633_029' into maint-0.2.9
2018-01-03 08:59:52 -05:00
Nick Mathewson
6e5e4f92ab
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
2018-01-02 10:09:44 -05:00
teor
09b9a35c07
Clear the address when we can't choose a reachable address
...
When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.
This is a precautionary measure, because some callers do not check the
return value.
Fixes bug 24736; bugfix on 0.2.8.2-alpha.
2017-12-25 01:55:28 +11:00
teor
30e1371675
Make the default DirAuthorityFallbackRate 0.1
...
This makes clients on the public tor network prefer to bootstrap off fallback
directory mirrors.
This is a follow-up to 24679, which removed weights from the default fallbacks.
Implements ticket 24681.
2017-12-23 00:01:31 +11:00
Nick Mathewson
79a50afa0e
Use monotime_coarse_absolute_msec() in destroy queue
...
This way it will match the insert queue in 029 and later.
2017-12-21 10:48:37 -05:00
Nick Mathewson
3b08184338
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-21 10:43:12 -05:00
Nick Mathewson
7d845976e3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-21 10:43:06 -05:00
Nick Mathewson
9202087760
Merge branch 'bug24666_squashed_025' into maint-0.2.5
2017-12-21 10:40:10 -05:00
Nick Mathewson
cd1f708a7f
Move free to end of test function so coverity won't complain.
2017-12-21 10:39:29 -05:00
Nick Mathewson
520cf21793
Move destroy cells into a separate queue type of their own, to save RAM
...
We've been seeing problems with destroy cells queues taking up a
huge amount of RAM. We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.
Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.
2017-12-21 10:29:01 -05:00
Nick Mathewson
c604a76a53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-20 12:15:23 -05:00
Nick Mathewson
877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
Karsten Loesing
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
Nick Mathewson
accd0ea65b
Fix the clz32 and clz64 settings on MSVC.
...
Fixes bug 24633; bugfix on 0.2.9.1-alpha.
2017-12-20 09:37:18 -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
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
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -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
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
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
73869c99a0
bump to 0.2.9.14-dev
2017-12-01 09:34:00 -05:00
Nick Mathewson
8f858de819
bump to 0.2.8.17-dev
2017-12-01 09:33:51 -05:00
Nick Mathewson
162a087e5f
bump to 0.2.5.16-dev
2017-12-01 09:33:41 -05:00
Nick Mathewson
16c9cfd658
version bump to 0.2.9.14
2017-11-30 12:24:07 -05:00
Nick Mathewson
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
Nick Mathewson
6ee4472544
version bump to 0.2.8.17
2017-11-30 12:22:32 -05:00
Nick Mathewson
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
Nick Mathewson
6bda6777c1
bump to 0.2.5.16
2017-11-30 12:19:48 -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
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
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
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
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
