aboutsummaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2005-09-14 14:45:02 +0000
committerPeter Palfrader <peter@palfrader.org>2005-09-14 14:45:02 +0000
commit2034c48f33752f984c4173e7063d93df79966ca0 (patch)
tree478209c8b04117201bbf23d4e363b65f1be56d00 /debian/changelog
parente4ee8a006949843541ecadcd380d4d7536b0e536 (diff)
downloadtor-2034c48f33752f984c4173e7063d93df79966ca0.tar.gz
tor-2034c48f33752f984c4173e7063d93df79966ca0.zip
Forward port to head
svn:r5056
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.