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
commit633813e313cc6e889790e2bf9875a842ba1d99b7 (patch)
tree0344c747eaa5fb9d81ceb14afa38a24ea156d5af
parent6506b1ee9f7d7daf31832c496ae9e30949fec995 (diff)
parent93019b4787e71a56d3d3f3bc89f65919930f1dda (diff)
downloadtor-633813e313cc6e889790e2bf9875a842ba1d99b7.tar.gz
tor-633813e313cc6e889790e2bf9875a842ba1d99b7.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
-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.