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

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

commit faf568fa7e8cfbebc236b6aef743251b7e6b9df4
Merge: 9969b0dfd 82f8b27ff
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Oct 25 09:28:15 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.8
    
    "ours" merge to avoid version bump




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