commit dd573f72b2f20b9aec310ee298ac4e9b737f835d Merge: db2f18b 7c54d2f Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.3.0'