From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Apr 2014 02:20:13 +0000 (-0400)
Subject: Merge branch 'bug9665_redux'
X-Git-Tag: tor-0.2.5.4-alpha~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84df7d73c9f8892220184e301627d5bddb9c3f79;p=thirdparty%2Ftor.git

Merge branch 'bug9665_redux'
---

84df7d73c9f8892220184e301627d5bddb9c3f79