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

Merge commit 'tor-0.2.2.5-alpha' into debian-merge

* commit 'tor-0.2.2.5-alpha':
  fix compile on windows
  bump to 0.2.2.5-alpha
  Move dizum to an alternate IP address.
  Ship test.h in release
---

fa79ef3573689abd546c116f412beda19852b00f