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

[nickm at torproject.org]

commit 70d39859d63344ac7cce4f69cb6a7ad510a8cc32
Merge: cf762c6 1122137
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 2 11:20:27 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9