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

[nickm at torproject.org]

commit 8408331b3e965dfad3c79fadc51f0b01eed366fe
Merge: ec4a7641f b203dedaf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 09:41:39 2018 -0400

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