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

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

commit 1174b50cab48be08b321deced0cfa022160d2c40
Merge: aec45bc 57e778f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 28 10:26:45 2017 -0500

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




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