[or-cvs] r6968: r8207 at galaxy: weasel | 2006-08-03 03:22:17 +0200 Merge in lo (in tor/trunk: . debian)

[weasel at seul.org]

Author: weasel
Date: 2006-08-02 21:50:10 -0400 (Wed, 02 Aug 2006)
New Revision: 6968

Modified:
   tor/trunk/
   tor/trunk/debian/changelog
Log:
 r8207 at galaxy:  weasel | 2006-08-03 03:22:17 +0200
 Merge in local revisions 7944, 8205, and 8206: Forward port 0.1.1.x changelog to trunk



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:6993
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
   + 1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:6993
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950

Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2006-08-03 01:49:48 UTC (rev 6967)
+++ tor/trunk/debian/changelog	2006-08-03 01:50:10 UTC (rev 6968)
@@ -13,6 +13,18 @@
 
  -- Peter Palfrader <weasel at debian.org>  Mon, 24 Jul 2006 05:37:17 +0200
 
+tor (0.1.1.23-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Peter Palfrader <weasel at debian.org>  Thu,  3 Aug 2006 03:13:24 +0200
+
+tor (0.1.1.22-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Peter Palfrader <weasel at debian.org>  Thu,  6 Jul 2006 02:55:37 +0200
+
 tor (0.1.1.21-1) unstable; urgency=low
 
   * New upstream version.