From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jan 2012 21:40:42 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.11-alpha~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e5d66997bb6efae378cf8783a0b07c12dd7146f;p=thirdparty%2Ftor.git

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

1e5d66997bb6efae378cf8783a0b07c12dd7146f