summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-12 09:13:12 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-12 09:13:12 -0500
commit706e6893d16e2097d9da4511060372c21f1cd24b (patch)
treef16887201c0136ddd7e10ad56d0ec806b32bb65d
parent58f974818c6fc9452bbdbe78d82ed10bdcbbae7e (diff)
parent4c54021baf4d22debc0381ae07edd911252dcd85 (diff)
downloadtor-706e6893d16e2097d9da4511060372c21f1cd24b.tar.gz
tor-706e6893d16e2097d9da4511060372c21f1cd24b.zip
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r--changes/bug236825
1 files changed, 0 insertions, 5 deletions
diff --git a/changes/bug23682 b/changes/bug23682
deleted file mode 100644
index 301ce73672..0000000000
--- a/changes/bug23682
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes (entry guards):
- - Tor now updates its guard state when it reads a consensus regardless of
- whether it's missing descriptors. That makes tor use its primary guards
- to fetch descriptors in some edge cases where it would have used fallback
- directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha. \ No newline at end of file