commit fb2fe41f6f5640c6bb98b0ef4242b1225c312f25 Merge: 98b694bfd 306563ac6 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 6 16:18:47 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25732 | 4 ++++ src/rust/include.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)