From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Dec 2015 17:35:26 +0000 (-0500)
Subject: Merge branch 'feature13696_squashed'
X-Git-Tag: tor-0.2.8.1-alpha~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f074e08d87c4119008c2b7b9689971f00e5edf8;p=thirdparty%2Ftor.git

Merge branch 'feature13696_squashed'
---

7f074e08d87c4119008c2b7b9689971f00e5edf8