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

[nickm at torproject.org]

commit bee3a46c977018e1e9e8a07e7b1bbfe0238e6f8d
Merge: c02646b 93ea18e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:56:47 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8