commit 9652c65fa3b9b3346d346daea05c8b3c22b3e125 Merge: 2c9e0a286 483a59ec2 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 19 10:18:35 2018 -0500 Merge branch 'maint-0.3.1' "ours" merge to avoid the 0.3.1 version of the 24863 fix.