From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 May 2016 17:55:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/bug13239_029_01'
X-Git-Tag: tor-0.2.9.1-alpha~276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2083cba9eb842ae7e85063d5751ddddc7302acb;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'dgoulet/bug13239_029_01'
---

b2083cba9eb842ae7e85063d5751ddddc7302acb