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