commit 9e566f3a72884cd8e1c5e4e4b48ad120bfe532fc Merge: 17c6de249 549a450f5 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 13 18:12:01 2018 -0500 Merge branch 'tests_rust' changes/ticket25071 | 4 ++++ src/test/include.am | 2 ++ 2 files changed, 6 insertions(+)