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
commitb2625b09f1e455d9a2a3704ae50d968276d170ac (patch)
tree8c4c2c51c93d967b4c7fd775936e88c06badc91d
parente1273d7d1ba5cced68b0b035176ee20fc3367681 (diff)
parent633813e313cc6e889790e2bf9875a842ba1d99b7 (diff)
downloadtor-b2625b09f1e455d9a2a3704ae50d968276d170ac.tar.gz
tor-b2625b09f1e455d9a2a3704ae50d968276d170ac.zip
Merge branch 'maint-0.3.4' into maint-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.