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

[nickm at torproject.org]

commit 30f05167f1b1dd26427a80db6494842f40049cb7
Merge: cf2f36b cc34ba1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 10:06:45 2016 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9