commit 0e5cf4a215f182aedbfaa58579c1c1b6fef3af59 Merge: 9919638 2dd1e21 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)