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

[nickm at torproject.org]

commit 157e6a293273b9f899384ee8da7550799308817b
Merge: 5e6c338 897d3c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 10:13:29 2016 -0500

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