From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Oct 2016 21:04:44 +0000 (-0400)
Subject: Merge remote-tracking branch 'arma/bug6769'
X-Git-Tag: tor-0.3.0.1-alpha~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e4b9259ad76ac12613bf569f45a2110ed0e400;p=thirdparty%2Ftor.git

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

87e4b9259ad76ac12613bf569f45a2110ed0e400