commit 349f95017c0d146a22980e2729dd0ad42f428bd4 Merge: 27e456cd7 97925322a Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)