Merge commit 'origin/maint-0.2.1'

Conflicts:

	debian/changelog

diff --cc ChangeLog
Simple merge

diff --cc debian/changelog
index 45b6b910f037adbc3b5e826bf837ddc40240784f,90afa018bbebd1ebb1ab73c8ba01f6c4ab2f0cd2..35a022815e11d3b9c0d995bc92dbc60b0ce86f9d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,67 -1,9 +1,73 @@@
 +tor (0.2.2.5-alpha-1) experimental; urgency=low
 +
 +  * New upstream version.
 +  * Pick 0a58567ce3418f410cf1dd0143dd3e56b4a4bd1f from master git tree:
 +    - work with libssl that has renegotiation disabled by default.
 +    (debian/patches/0a58567c-work-with-reneg-ssl.dpatch)
 +  * Therefore build-depend on libssl-dev >= 0.9.8k-6.  If we build against
 +    earlier versions we will not work once libssl gets upgraded to a version
 +    that disabled renegotiations.
 +  * Change order of recommends from privoxy | polipo to polipo | privoxy.
 +  * Allegedly echo -e is a bashism.  Remove it from debian/rules, we don't
 +    need it anyways (closes: #478631).
 +  * Change the dependency on tsocks to torsocks | tsocks (see: #554717).
 +
 + -- Peter Palfrader <weasel@debian.org>  Sun, 15 Nov 2009 11:04:02 +0100
 +
 +tor (0.2.2.4-alpha-1) experimental; urgency=low
 +
 +  * New upstream version.
 +  * The testsuite moved from src/or/test to src/test/test,
 +    but let's call it using "make check" now.
 +  * Upstream failed to ship src/test/test.h.  Ship it in debian/ and
 +    manually copy it in place during configure and clean up in clean.
 +    Let's not use the patch system as this will most likely be rectified
 +    by next release.
 +
 + -- Peter Palfrader <weasel@debian.org>  Sun, 11 Oct 2009 10:38:55 +0200
 +
 +tor (0.2.2.3-alpha-1) experimental; urgency=low
 +
 +  * New upstream version.
 +
 + -- Peter Palfrader <weasel@debian.org>  Wed, 23 Sep 2009 10:27:40 +0200
 +
 +tor (0.2.2.2-alpha-1) experimental; urgency=low
 +
 +  * New upstream version.
 +  * The files src/common/common_sha1.i src/or/or_sha1.i get changed
 +    during the build - they contain the checksums of the individual
 +    files that end up in the binary.  Of couse changes only end up
 +    in the debian diff.gz after building a second time in the same
 +    directory.  So, remove those files in clean to get both a cleaner
 +    diff.gz and idempotent builds.
 +  * If we have a debian/micro-revision.i, replace the one in src/or
 +    with our copy so that this will be the revision that ends up in
 +    the binary.  This is an informational only version string, but
 +    it'd be kinda nice if it was (more) accurate nonetheless.
 +    .
 +    Of course this won't help if people manually patch around but
 +    it's still preferable to claiming we are exactly upstream's source.
 +    .
 +    If we are building directly out of a git tree, update
 +    debian/micro-revision.i in the clean target.
 +
 + -- Peter Palfrader <weasel@debian.org>  Mon, 21 Sep 2009 14:51:20 +0200
 +
 +tor (0.2.2.1-alpha-1) experimental; urgency=low
 +
 +  * New upstream version.
 +  * Forward port patches/03_tor_manpage_in_section_8.dpatch.
 +  * Forward port patches/06_add_compile_time_defaults.dpatch.
 +
 + -- 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.