From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 25 Nov 2013 15:56:52 +0000 (-0500)
Subject: Merge branch 'bug4677'
X-Git-Tag: tor-0.2.5.2-alpha~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c64d5227401a44e8a1fcd85a67356a53b83cff82;p=thirdparty%2Ftor.git

Merge branch 'bug4677'
---

c64d5227401a44e8a1fcd85a67356a53b83cff82