[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



commit b2b604ecb4df95526a309c9ff507dff942472daa
Merge: aeb299b 4bab288
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:22:36 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5
    
    "ours" merge to avoid bumping version




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