commit 129456e22257d24c380bed0f9ebc9d68955a01df Merge: de3cf40fa 7f2e23e7a Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 19 16:30:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2