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

[nickm at torproject.org]

commit 725f2371042b36c151a42e575a5b319d3820126c
Merge: 09d2ae562 912ebf165
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:10:17 2017 -0400

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