commit 7ebec27e726487e03638b3d0a2b86e74c567d6b7 Merge: 58e39a5 2dd1e21 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)