From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 25 Jul 2009 09:15:42 +0000 (+0200)
Subject: Merge branch 'debian-merge' into debian
X-Git-Tag: tor-0.2.1.19~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39cee375472a6e3a4f0decb7e2f91c5768a2165;p=thirdparty%2Ftor.git

Merge branch 'debian-merge' into debian

* debian-merge:
  New upstream version
  bump to 0.2.1.18
  put in the full 0.2.1 release notes
  add a changelog entry for the upcoming 0.2.1.18
  make phobos's lines start with tabs again
  added LIBS=-lrt to Makefile.am for static libevent in the tor rpms.
  forward-port the 0.2.0.35 release notes
  add blurbs for recent release candidates
  Bump version to 0.2.1.17-rc-dev
---

f39cee375472a6e3a4f0decb7e2f91c5768a2165