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

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



commit 70161785f94ee9e1571af4ec804bf57f877f40e8
Merge: af08dad6d 5aaecf6d0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jul 9 10:30:46 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3
    
    `-s ours` to avoid version bump.




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