From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 11 Jan 2015 16:24:48 +0000 (-0500)
Subject: Merge remote-tracking branch 'candrews/issue13805'
X-Git-Tag: tor-0.2.6.3-alpha~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c98e075ebc17d7e5b4548cc58f58088cff83d0ca;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'candrews/issue13805'
---

c98e075ebc17d7e5b4548cc58f58088cff83d0ca