From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 6 Feb 2016 20:30:22 +0000 (-0500)
Subject: Merge remote-tracking branch 'yawning/bug18221'
X-Git-Tag: tor-0.2.8.2-alpha~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f5f6b8a412615026603954b1760006723026da1;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/bug18221'
---

0f5f6b8a412615026603954b1760006723026da1