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

[nickm at torproject.org]

commit ba2cc781efa35ecf86757279cb3dc32323f0193d
Merge: a52d5d530 96601a680
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 09:42:50 2018 -0400

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