commit d00a26f8602f615f241895dd2a0d69cb74961114 Merge: 7bc85d820 e31ffb274 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 3 08:05:46 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/bug23741'

changes/bug23741 | 4 ++++ scripts/test/coverage | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)