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

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1



commit 7a9e2a261b44b93e244c04593dee8f7757ba32bc
Merge: 7f0ad3343 d17108a18
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 13 16:56:44 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1
    
    "ours" to avoid version bump.




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