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

[nickm at torproject.org]

commit 14edb0bd0cc97a8cab84b9e28c7bfe97b3a0cbc0
Merge: 7601edc cf6da1e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 21:40:38 2016 -0500

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