aboutsummaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-11-17 15:39:46 -0500
committerRoger Dingledine <arma@torproject.org>2009-11-17 15:39:46 -0500
commit55cd2fa310ae328eba3ed99992e530faa2471a97 (patch)
tree4dc38aec0fcaf6e98fa4637192ce0d21502b8c11 /debian/changelog
parente722ffa60508d4959566eb210aa8e2a00c6cf899 (diff)
parent0656c12b077f1241ca9b3b471b3d5f1b34dead94 (diff)
downloadtor-55cd2fa310ae328eba3ed99992e530faa2471a97.tar
tor-55cd2fa310ae328eba3ed99992e530faa2471a97.tar.gz
Merge commit 'origin/maint-0.2.1'
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 45b6b910f..35a022815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,12 @@ tor (0.2.2.1-alpha-1) experimental; urgency=low
-- Peter Palfrader <weasel@debian.org> Thu, 03 Sep 2009 15:10:26 +0200
+tor (0.2.1.20-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Peter Palfrader <weasel@debian.org> Fri, 13 Nov 2009 19:02:47 +0100
+
tor (0.2.1.19-1) unstable; urgency=low
* New upstream version.