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

[nickm at torproject.org]

commit 746c51b6132d84fc7899e6b95b4a1666717d8cce
Merge: b18bde2 39ef343
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 18:22:27 2016 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    ("ours" merge because there is a separate 20384 patch for 026)