From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 7 Feb 2013 19:31:04 +0000 (-0500)
Subject: Merge branch 'ticket8161_squashed'
X-Git-Tag: tor-0.2.4.11-alpha~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12c6475c064c7792004582031b8409dddfe0327f;p=thirdparty%2Ftor.git

Merge branch 'ticket8161_squashed'
---

12c6475c064c7792004582031b8409dddfe0327f