From: teor <teor@torproject.org>
Date: Wed, 13 Mar 2019 20:59:09 +0000 (+1000)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~46^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d41e2223f64517300aad168b2f2479ba00ac10b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.
---

5d41e2223f64517300aad168b2f2479ba00ac10b