[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 7d3d56e59a3df16615881007a77b77e30fecb831
Merge: db58d4d 8f857c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:19:41 2016 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5
    
    (ours merge -- there is a separate 0.2.5 patch for 20384.)