commit 9b65d7f4159a70bc83399614548782b458d19851 Merge: 5a739e59a 7c68b2f1a Author: Nick Mathewson <nickm at torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1