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

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3



commit 6384d314fb47a088299a14b52e5f60b6e79697b4
Merge: 9f1899fdf bd71e0a0c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 16 09:55:41 2018 -0500

    Merge branch 'maint-0.3.2' into maint-0.3.3
    
    "ours" merge to avoid taking 24902 a second time and having to reconcile
    all the merge conflicts.




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