[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 876aeeb248832a8755bf2232af8ddd1efdd27e00
Merge: 8143c30 8384f4d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 12 08:25:12 2016 -0500

    Merge branch 'maint-0.2.9'
    
    Ours merge to avoid taking version bump.