From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Jan 2012 19:45:18 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.11-alpha~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93d3a917e878e42950faf6199205a6933a40c900;p=thirdparty%2Ftor.git

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

93d3a917e878e42950faf6199205a6933a40c900