commit 3bda8ab0aeb15cabbee3f184cad0f3d7f81c205b Merge: f5f377ecb 9d1c7c3a8 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 05:39:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25479 | 4 ++++ src/test/bench.c | 2 ++ 2 files changed, 6 insertions(+)