commit 37abaa5a14d3c3336632760e616651f1d3e21316 Merge: 0331e28 b47249e Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)