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

[nickm@xxxxxxxxxxxxxx]

commit 746c51b6132d84fc7899e6b95b4a1666717d8cce
Merge: b18bde2 39ef343
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
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)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits