commit 77a848b9d47a9f7b19bcb3204056633d7a1bd18f Merge: 8b4ff0168 eaa8224ce Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 11 17:49:18 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22446 | 4 ++++ 1 file changed, 4 insertions(+)