summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-12-11 10:00:22 -0500
committerNick Mathewson <nickm@torproject.org>2018-12-11 10:00:22 -0500
commit06870e301821250206929d6978b82d0ade9526aa (patch)
tree620dda49bb354f3c108d939153ecabef3677ff51
parent433cff76a21efd567fecc1b7d0dacf9010b0352b (diff)
parentb2625b09f1e455d9a2a3704ae50d968276d170ac (diff)
downloadtor-06870e301821250206929d6978b82d0ade9526aa.tar.gz
tor-06870e301821250206929d6978b82d0ade9526aa.zip
Merge branch 'maint-0.3.5' into release-0.3.5
-rw-r--r--changes/ticket248032
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/ticket24803 b/changes/ticket24803
index c46d3804df..e76a9eeab9 100644
--- a/changes/ticket24803
+++ b/changes/ticket24803
@@ -2,4 +2,4 @@
- Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
- December 2018.
+ December 2018. Closes ticket 24803.