commit f4e1887403c1b405aa1511b4035063c897cc4321 Merge: 04f1dda a06c465 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Apr 3 09:29:18 2017 -0400 Merge branch 'maint-0.3.0'