From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 May 2016 14:39:34 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/ticket19044'
X-Git-Tag: tor-0.2.9.1-alpha~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0dd8360983e8df41424694f4708ffa6f03f65a1;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/ticket19044'
---

a0dd8360983e8df41424694f4708ffa6f03f65a1