commit c43e81a5a3afb9d1ed9808104672b3954cdd7005 Merge: 42c02097d 08b82409d Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 18 16:30:11 2018 -0400

Merge remote-tracking branch 'teor/ticket26702-atomically'

doc/tor.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)