aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-15 18:24:24 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-15 18:24:24 -0400
commit0f718a85eaad6cd2b4ad34aff2b7f4face4eb258 (patch)
tree278ecb8103883a98151ec7fe86ad2f96fadf7c32
parent716d48581de72e5773c15802df5ca66b5f7365e5 (diff)
parent3b8888c544f3186f12295bc436cbbec1a99cbf02 (diff)
downloadtor-0f718a85eaad6cd2b4ad34aff2b7f4face4eb258.tar.gz
tor-0f718a85eaad6cd2b4ad34aff2b7f4face4eb258.zip
Merge branch 'bug22246_030' into maint-0.3.0
-rw-r--r--changes/bug222466
-rw-r--r--src/or/main.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug22246 b/changes/bug22246
new file mode 100644
index 0000000000..dbdf31a433
--- /dev/null
+++ b/changes/bug22246
@@ -0,0 +1,6 @@
+ o Major bugfixes (hidden service directory, security):
+ - Fix an assertion failure in the hidden service directory code, which
+ could be used by an attacker to remotely cause a Tor relay process to
+ exit. Relays running earlier versions of Tor 0.3.0.x should upgrade.
+ This security issue is tracked as tracked as
+ TROVE-2017-002. Fixes bug 22246; bugfix on 0.3.0.1-alpha.
diff --git a/src/or/main.c b/src/or/main.c
index 5549f97998..bc7b3db2b9 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2926,6 +2926,7 @@ tor_init(int argc, char *argv[])
rep_hist_init();
/* Initialize the service cache. */
rend_cache_init();
+ hs_cache_init();
addressmap_init(); /* Init the client dns cache. Do it always, since it's
* cheap. */