From 8717d8127a12ee018cae1a009e9c075c9152fb74 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 15 Dec 2006 19:53:56 +0000
Subject: [PATCH] Merge 0.1.1.26-1 changelog into trunk

svn:r9127
---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b653ff9ca2..486203878c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,13 @@ tor (0.1.2.1-alpha-1) experimental; urgency=low
 
  -- Peter Palfrader <weasel@debian.org>  Tue, 29 Aug 2006 22:38:29 +0200
 
+tor (0.1.1.26-1) unstable; urgency=high
+
+  * New upstream version (Stop sending the HttpProxyAuthenticator string to
+    directory servers when directory connections are tunnelled through Tor).
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 15 Dec 2006 20:24:07 +0100
+
 tor (0.1.1.25-1) unstable; urgency=low
 
   * New upstream version.