From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Nov 2009 09:37:48 +0000 (+0100)
Subject: Merge branch 'debian-merge' into debian
X-Git-Tag: tor-0.2.2.6-alpha~7^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d01081fb39ba4dac41beaf934510591331caac6;p=thirdparty%2Ftor.git

Merge branch 'debian-merge' into debian

* debian-merge:
  New upstream version
  fix compile on windows
  bump to 0.2.2.5-alpha
  Move dizum to an alternate IP address.
  Ship test.h in release
---

6d01081fb39ba4dac41beaf934510591331caac6