From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 Nov 2015 14:00:01 +0000 (-0500)
Subject: Merge remote-tracking branch 'gtank/feature17663'
X-Git-Tag: tor-0.2.8.1-alpha~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e5385da701392c3fb72487753831b30a0b0c5c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'gtank/feature17663'
---

74e5385da701392c3fb72487753831b30a0b0c5c