commit 89b9951ecd5b12eefc796604bc7560ce4a5308d9 Merge: 0fc2b7f82 9092e9019 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1