commit d92a56c70b454c78444e5de84b26918a1e7682fd Merge: 71c8974 31b79f0 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Apr 26 13:31:19 2017 -0400 Merge branch 'maint-0.3.0'