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

[nickm at torproject.org]

commit 7f55aaf281473089355c855c2632b2d1a9467ebb
Merge: f62c74c a9c8a5f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:15:26 2016 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8