commit 8d5ad8cd34a7755d025ec4a50879acea5ded7ddc Merge: a5c9ae852 c61cd5775 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Dec 18 08:09:53 2018 -0500
Merge branch 'maint-0.3.5' Used "git merge -s ours" to avoid taking the revert of 28731. _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits