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/10582_tproxy | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changes/10582_tproxy

(limited to 'changes/10582_tproxy')

diff --git a/changes/10582_tproxy b/changes/10582_tproxy
deleted file mode 100644
index 0a05152dd..000000000
--- a/changes/10582_tproxy
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features:
-    - Add support for the TPROXY transparent proxying facility on Linux.
-      See documentation for the new TransProxyType option for more
-      details. Implementation by "thomo". Closes ticket 10582.
-
-
-- 
cgit v1.2.3