commit 2fa97dfb7323ca8106e8e94fefa22274d0db5065 Merge: 29784d80f 387795815 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 10 09:33:55 2018 -0500

Merge remote-tracking branch 'teor/bug22145_032'

doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)