From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2011 00:20:36 +0000 (-0400)
Subject: Merge branch 'bug2972' into maint-0.2.2
X-Git-Tag: tor-0.2.3.2-alpha~116^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ede102fd4675af8ac4060767f0348f3c93617e80;p=thirdparty%2Ftor.git

Merge branch 'bug2972' into maint-0.2.2
---

ede102fd4675af8ac4060767f0348f3c93617e80