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

[nickm at torproject.org]

commit a9bfa997aeb33babc7bbcb314891122b07e6dbfa
Merge: 897d3c6 7f55aaf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:15:56 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9