From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Nov 2014 18:25:17 +0000 (-0500)
Subject: Merge branch 'ticket13172'
X-Git-Tag: tor-0.2.6.2-alpha~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2170171d84e30bc4b1b2565255bd978668c50e97;p=thirdparty%2Ftor.git

Merge branch 'ticket13172'
---

2170171d84e30bc4b1b2565255bd978668c50e97