[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit 8cfca28be28f36eec93195f8818ab7adc20426d1
Merge: cff7cb858 8408331b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 09:41:55 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3
    
    "ours" to avoid version bump.