From: Peter Palfrader Date: Wed, 23 Sep 2009 08:33:12 +0000 (+0200) Subject: Merge branch 'debian-merge' into debian X-Git-Tag: tor-0.2.2.4-alpha~34^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7d0711df2b27a2c03c262d8501c4aee166f192e;p=thirdparty%2Ftor.git Merge branch 'debian-merge' into debian * debian-merge: New upstream version finishing touches on the changelog bump to 0.2.2.3-alpha, plus add a changelog for bug 1103 Be more robust to bad circwindow values Fix Bug 1103. Bump version to 0.2.2.2-alpha-dev --- c7d0711df2b27a2c03c262d8501c4aee166f192e