commit 39c5e1b84994c2f226a8530b930f215cc5ffb877 Merge: c1d4399c8 f470b863a Author: Nick Mathewson <ni...@torproject.org> Date: Wed Jan 29 19:44:34 2020 -0500
Merge branch 'maint-0.4.2'
Use "-s ours" to avoid version bump.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
