From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Dec 2014 16:46:56 +0000 (-0500)
Subject: Merge remote-tracking branch 'yawning/bug13315_fixup'
X-Git-Tag: tor-0.2.6.2-alpha~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e4423bd2bf684849c968ff6bb19dfc3ee7d788;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/bug13315_fixup'
---

f2e4423bd2bf684849c968ff6bb19dfc3ee7d788