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