aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-07-24 18:18:25 -0400
committerRoger Dingledine <arma@torproject.org>2009-07-24 18:37:12 -0400
commitc3274c4c430ac8e55b9ded0d939215c281991682 (patch)
treeaa8a64bab16318cf8a1bdd02d4fc094ca1264ef3 /debian
parentf80537e3e079ffa18f3b42aff05848fe0407171a (diff)
parent52b142219b9ed4b3de8fee4bc09b229cb3f7b410 (diff)
downloadtor-c3274c4c430ac8e55b9ded0d939215c281991682.tar.gz
tor-c3274c4c430ac8e55b9ded0d939215c281991682.zip
Merge branch 'maint-0.2.1' into master
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/copyright2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 234de20f59..414a23644f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tor (0.2.1.17-rc-1) experimental; urgency=low
+
+ * New upstream version.
+ * Update upstream URL in debian/copyright.
+
+ -- Peter Palfrader <weasel@debian.org> Mon, 13 Jul 2009 23:37:37 +0200
+
tor (0.2.1.16-rc-1) experimental; urgency=low
* New upstream version.
diff --git a/debian/copyright b/debian/copyright
index ca8ad0b3a6..f89185257d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Peter Palfrader <weasel@debian.org> on
Sat, 10 Jan 2004 11:20:06 +0100.
-It was downloaded from http://tor.eff.org/
+It was downloaded from https://www.torproject.org/
Upstream Authors: Roger Dingledine <arma@freehaven.net>
Nick Mathewson <nickm@freehaven.net>