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

[nickm at torproject.org]

commit 2e2aacca2aa635a840c57e87e3769403505a19d2
Merge: c527a8a9c 9eb6f9d3c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:32:29 2018 -0500

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