diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:24:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:24:30 -0400 |
| commit | 1fbd1e526c97347b867e8c3a0851355f65d6e7cd (patch) | |
| tree | bdb43ba68eb7a08e847455d512d58a3094fd3d2f | |
| parent | e4f29dc61ae4c2003bfc5c1a17434d99067231b2 (diff) | |
| parent | 0f718a85eaad6cd2b4ad34aff2b7f4face4eb258 (diff) | |
| download | tor-1fbd1e526c97347b867e8c3a0851355f65d6e7cd.tar.gz tor-1fbd1e526c97347b867e8c3a0851355f65d6e7cd.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | changes/bug22246 | 6 | ||||
| -rw-r--r-- | src/or/main.c | 1 |
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. */ |