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

[nickm at torproject.org]

commit 5e6c338b76aa87dcec3882009c81c51c886d420e
Merge: f9f1e3c 24318fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 08:09:01 2016 -0500

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