From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 May 2016 01:10:17 +0000 (-0400)
Subject: Merge remote-tracking branch 'arma/feature18998'
X-Git-Tag: tor-0.2.9.1-alpha~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84af12e9dbbfb166ee37fd75691e9e7f96dbad5d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'arma/feature18998'
---

84af12e9dbbfb166ee37fd75691e9e7f96dbad5d