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

[nickm at torproject.org]

commit f8766e887879214297175b0548e3ba4235879df3
Merge: 57b1cc1f7 d7ad6d924
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 15:17:59 2018 -0400

    Merge branch 'maint-0.3.4'
    
    "ours" to avoid a pair of version bumps.