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

[nickm at torproject.org]

commit 5d63ceb25cfd7c6cf10cd56e229cf233cdf8987d
Merge: c59e04b 7f55aaf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:15:45 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8