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

[nickm at torproject.org]

commit 2e54c80aec5ed4684950f5ef1ba208fcc0b8339c
Merge: 81175ecaf 4c1c818ff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 16:50:24 2018 -0400

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