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

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5



commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93
Merge: 97f7efa9e 484710f25
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 17 18:57:49 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.5
    
    "ours" merge to avoid picking up 0.2.9 version of ticket 31673.




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