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

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

commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac
Merge: f7ed4a7 884b371
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:25:51 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    "ours" merge to avoid version bumps




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