aboutsummaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2007-04-27 13:28:07 +0000
committerPeter Palfrader <peter@palfrader.org>2007-04-27 13:28:07 +0000
commit8dd603616eaeb00c258a34405d5b2043e27f4f82 (patch)
tree994ca0376c4b46890d2f0eabe1a5b14f72c9fcc9 /debian/changelog
parent397afcc3f667f02de3599ab3ba53638b484853b7 (diff)
downloadtor-8dd603616eaeb00c258a34405d5b2043e27f4f82.tar
tor-8dd603616eaeb00c258a34405d5b2043e27f4f82.tar.gz
Merge branches/tor-0_1_2-patches/debian (from 9860 on) to trunk. This includes 0.1.2.13-1 and 0.1.2.13-2.
svn:r10039
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0ac2a12ad..41d6efe35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tor (0.1.2.13-2) unstable; urgency=low
+
+ * In options_init_from_torrc()'s error path only config_free() options
+ if they already have been initialized (closes: #421235).
+
+ -- Peter Palfrader <weasel@debian.org> Fri, 27 Apr 2007 13:06:37 +0200
+
+tor (0.1.2.13-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Peter Palfrader <weasel@debian.org> Tue, 24 Apr 2007 21:21:10 +0200
+
tor (0.1.2.12-rc-1) experimental; urgency=low
* New upstream version.