[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

[teor at torproject.org]

commit 5d41e2223f64517300aad168b2f2479ba00ac10b
Merge: ffd720702 e021f89f3
Author: teor <teor at torproject.org>
Date:   Thu Mar 14 06:59:09 2019 +1000

    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.