commit 4e3f9c1f3af6292f30799f005f6df8f9c1bc7fee Merge: 4402289 e90bd48 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 6 11:56:46 2016 -0400

Merge remote-tracking branch 'pastly/ticket19122'

changes/19122 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)