commit 5a739e59a4096841f45b992b9292b3f1af2e0be4 Merge: 4a19498ed 1d48712c2 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:21:19 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1