From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Nov 2011 16:55:11 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25875f533b1798ef4e131124ed76a97b77f368c6;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'
---

25875f533b1798ef4e131124ed76a97b77f368c6