From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 May 2016 17:22:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'arma/task19035-fixedup'
X-Git-Tag: tor-0.2.9.1-alpha~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e5ad15688ee3f3660fe35cab23022126b55262d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'arma/task19035-fixedup'
---

1e5ad15688ee3f3660fe35cab23022126b55262d