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

[nickm at torproject.org]

commit 17f20c7b3f385db6bec4ee8f32f050f7953fbcca
Merge: 5d63ceb cb2e205
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:23:49 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8