From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Feb 2016 12:25:12 +0000 (-0500)
Subject: Merge branch 'bug17795'
X-Git-Tag: tor-0.2.8.2-alpha~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=882e0fbd76b9b56b943680a310d16fc94ab07438;p=thirdparty%2Ftor.git

Merge branch 'bug17795'
---

882e0fbd76b9b56b943680a310d16fc94ab07438