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

[nickm at torproject.org]

commit d51595ec573df21cc96ee71fbb466d6a4e30ae1c
Merge: 85c5f5850 ea47563dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 10:22:47 2019 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" to avoid version bump.