From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Sep 2015 14:41:51 +0000 (-0400)
Subject: Merge branch 'bug16980'
X-Git-Tag: tor-0.2.7.3-rc~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c6fd7106fdf1a31c1e50a992c03dac69cd25a47;p=thirdparty%2Ftor.git

Merge branch 'bug16980'
---

4c6fd7106fdf1a31c1e50a992c03dac69cd25a47