From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Feb 2018 13:51:29 +0000 (-0500)
Subject: Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha
X-Git-Tag: tor-0.3.4.0-alpha-dev~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=412a8256a5c13231b89edb782b0e8555bde2c30a;p=thirdparty%2Ftor.git

Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha
---

diff --git a/changes/ticket25170 b/changes/ticket25170
deleted file mode 100644
index 0652139400..0000000000
--- a/changes/ticket25170
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfix (directory authority, documentation):
-    - When a fingerprint or network address is marked as rejected, the
-      returned message by the authority now explicitly mention to set a valid
-      ContactInfo address and contact the bad-relays@ mailing list. Fixes bug
-      25170; bugfix on 0.2.9.1.