[tor-commits] [tor/master] Merge branch 'pr_339_squashed'

[nickm at torproject.org]

commit 6b90972dc6c13a252368faf5aa8003a89495a96e
Merge: 9767cf8cc d49133d9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 24 11:25:39 2018 -0400

    Merge branch 'pr_339_squashed'

 changes/doc27677            | 4 ++++
 doc/HACKING/WritingTests.md | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)