commit bc6769e0d4a089c9fb3aec4cb48ad7321c499ecf Merge: a6c62cbd1 6a2a49e66 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 3 09:04:21 2017 -0400

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

changes/bug23739 | 3 +++ doc/HACKING/HelpfulTools.md | 22 +++++++++++++++------- doc/HACKING/WritingTests.md | 6 +++++- 3 files changed, 23 insertions(+), 8 deletions(-)