commit 00fe214729b935adc522883fa84b399429fefa74 Merge: 0c90fc37e 0ff3e8f4a Author: Nick Mathewson <ni...@torproject.org> Date: Tue Feb 11 08:53:00 2020 -0500
Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" merge, since the exceptions.txt file is already fixed in this branch.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
