commit 58ac00fce88b70de78c30a5b9ee1db051f2e1c96 Merge: 34ea50b32 9713ecfc4 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)