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

[nickm at torproject.org]

commit 495db72c1eee7f9ed890ae252eb5b61a70438065
Merge: 73869c99a dc3890439
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:07 2017 -0500

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