From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Dec 2011 16:38:40 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.35~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c70ca0e944a086d03b92d978c957a5de90d00c8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2' into release-0.2.2
---

2c70ca0e944a086d03b92d978c957a5de90d00c8