From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 24 Oct 2016 16:47:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'pastly/ticket20273'
X-Git-Tag: tor-0.3.0.1-alpha~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01482e30ad8a453f3721ef17a4a9633806b90684;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'pastly/ticket20273'
---

01482e30ad8a453f3721ef17a4a9633806b90684