commit d95892c5d21a3b7a1252e691c5575cbc4841a0a7 Merge: 7fb9586 7ae7e3c Author: Nick Mathewson <nickm at torproject.org> Date: Wed Apr 26 15:37:52 2017 -0400 Merge branch 'maint-0.3.0'