commit c5e610af05dc7112a9b3aa18feeb6ba63290ff5c Merge: 49cffee63 7afb95d3e Author: Nick Mathewson <ni...@torproject.org> Date: Thu Jan 30 11:19:23 2020 -0500
Merge branch 'maint-0.4.1' into maint-0.4.2
Using "ours" strategy to avoid version bump
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
