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

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



commit 8af8ecabbe429503a4ff9d5510df610907c6e45a
Merge: c0e18d2f8 15e752e6b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 15 16:55:42 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" merge to avoid duplicating conflict resolution in merge of 24104

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