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

[nickm at torproject.org]

commit 23c5259a384b435c76b5cae40f68f07aec34d241
Merge: e78347fcc 42e12a353
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 14:40:36 2017 -0400

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