From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 17:22:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'arma/feature18760'
X-Git-Tag: tor-0.2.9.1-alpha~257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c6f059e6aa5e4b7937f364cc0101229b6386818;p=thirdparty%2Ftor.git

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

3c6f059e6aa5e4b7937f364cc0101229b6386818