commit 40aa1b1fdc459eebffcdc7596cd1972713ef5d56 Merge: 78d4200 d389480 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jun 8 09:29:36 2017 -0400 Merge branch 'maint-0.3.0'