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
commit4c54021baf4d22debc0381ae07edd911252dcd85 (patch)
tree5281ce70aca2d11766713431b40593e14edb0798
parent4593f5a6e12132be4ac97d7a93675d1a04fa4b29 (diff)
parent31ce03a2b976966f8c4045f4a3e936b02b25352e (diff)
downloadtor-4c54021baf4d22debc0381ae07edd911252dcd85.tar.gz
tor-4c54021baf4d22debc0381ae07edd911252dcd85.zip
Merge branch 'maint-0.3.1' into maint-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