[tor-commits] [tor/master] Merge commit '7b859fd8c558c9cf08add79db87fb1cb76537535'

[nickm at torproject.org]

commit 7bdbcdaed8ed95986de854488572b6b822ab8435
Merge: f7ccc9b 7b859fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 13 08:42:20 2015 -0500

    Merge commit '7b859fd8c558c9cf08add79db87fb1cb76537535'

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