[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 a88ce61b351412a9a62c8e2340773b5b682f1b17
Merge: 4b6b58ed8 1e6ffeaea
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 15 16:38:19 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" merge to avoid the 0.3.3 version of #27550.

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