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

[nickm at torproject.org]

commit 8f043ffc647bf129e8a6d0c5991586fac880c489
Merge: 24318fb f62c74c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 10:12:34 2016 -0500

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