commit d4f87073aec5e8ef6090cf8f246ffd7483968567 Merge: 72ea4a8f0 c894e9d3d Author: Nick Mathewson <nickm at torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1