summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e4bae69998..cf00327ff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tor (0.1.1.6-alphaXX) experimental; urgency=low
+
+ * More merging from 0.1.0.14+XXXX:
+ - The tor-dbg package does not really need its own copy of copyright
+ and changelog in usr/share/doc/tor-dbg.
+
+ -- Peter Palfrader <weasel@debian.org> Wed, 14 Sep 2005 16:44:26 +0200
+
tor (0.1.1.6-alpha-2) experimental; urgency=low
* Merge 0.1.0.14+XXXX changes.