[tor-commits] [tor/master] Merge remote-tracking branch 'pastly/ticket20486'

[nickm at torproject.org]

commit db67867a81c18901b161d23696bbecf965107089
Merge: e6d84ac d8d6d8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 1 12:55:14 2016 -0400

    Merge remote-tracking branch 'pastly/ticket20486'

 changes/ticket20486 | 3 +++
 doc/tor.1.txt       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)