From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Feb 2013 22:03:12 +0000 (-0500)
Subject: Merge branch 'ticket8081_squashed'
X-Git-Tag: tor-0.2.4.10-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4074ff440e20c6549d8589a4f214791d610e3deb;p=thirdparty%2Ftor.git

Merge branch 'ticket8081_squashed'
---

4074ff440e20c6549d8589a4f214791d610e3deb