From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 4 Jan 2019 19:36:02 +0000 (-0500)
Subject: Merge branch 'maint-0.3.4' into release-0.3.4
X-Git-Tag: tor-0.3.4.10~7
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f81078527791b244c0200e53ac4862b36c21a1d9;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into release-0.3.4
---

f81078527791b244c0200e53ac4862b36c21a1d9