commit 3716ddf1b42270b5db76f8b7b458c5f61aa40e23 Merge: 9f884a38e f8d549db7 Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 2 11:35:06 2018 -0700

Merge remote-tracking branch 'rl1987/doc25237'

changes/doc25237 | 4 ++++ src/or/or.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)