commit 912f366bd5597de6da7d48168d1ed1302702cae3 Merge: 054d7c5 4c21d4e Author: Nick Mathewson <nickm at torproject.org> Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1