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

[nickm at torproject.org]

commit ff05162710cb514b3c0c054b034dc9c2bd66e97d
Merge: bbdf56aed d8d4fe83d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:08:53 2018 -0400

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