From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Jan 2017 14:20:49 +0000 (-0500)
Subject: Merge branch 'bug20824_v4'
X-Git-Tag: tor-0.3.0.3-alpha~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e8671bb9adffcb5893cae7ea03e06179e073d4c;p=thirdparty%2Ftor.git

Merge branch 'bug20824_v4'
---

9e8671bb9adffcb5893cae7ea03e06179e073d4c