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

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

commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334
Merge: 0a43134 5446cb8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 7 09:29:27 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7
    
    "ours" merge to avoid reverting 17354, which was already fixed in
    0.2.7.4-rc.




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