From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 Nov 2015 17:25:44 +0000 (-0500)
Subject: Merge branch 'bug17654_try1'
X-Git-Tag: tor-0.2.8.1-alpha~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=289b184e112885d4feb9569c77d322995b9417c7;p=thirdparty%2Ftor.git

Merge branch 'bug17654_try1'
---

289b184e112885d4feb9569c77d322995b9417c7