From 8028d8fded9c9fede1e39b169dd06272ceca024b Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Thu, 13 Feb 2014 02:46:26 -0500
Subject: fold in the changes files to the new 0.2.5.2-alpha changelog

---
 changes/bug10881 | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 changes/bug10881

(limited to 'changes/bug10881')

diff --git a/changes/bug10881 b/changes/bug10881
deleted file mode 100644
index 62da79eca..000000000
--- a/changes/bug10881
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Removed config options:
-    - Remove the HSAuthoritativeDir and AlternateHSAuthority torrc
-      options, which were used for designating authorities as "Hidden
-      service authorities". There has been no use of hidden service
-      authorities since 0.2.2.1-alpha, when we stopped uploading or
-      downloading v0 hidden service descriptors. Fixes bug 10881; also
-      part of a fix for bug 10841.
-- 
cgit v1.2.3