From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Nov 2015 13:27:42 +0000 (-0500)
Subject: Merge branch 'bug3199_redux_3'
X-Git-Tag: tor-0.2.8.1-alpha~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c113d19b53085f0218f892829839817add071576;p=thirdparty%2Ftor.git

Merge branch 'bug3199_redux_3'
---

c113d19b53085f0218f892829839817add071576