commit 7dddef2a76ccfdb27293c7035b073e5c15135137 Merge: 441bfcd88 89b9951ec Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2