[tor-commits] [tor/master] Merge branch 'bug20487_029' into maint-0.2.9

[nickm at torproject.org]

commit 9248466f0a020e661cad185fc8eec28a18aca36c
Merge: e712b5d b858452
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 1 12:44:20 2016 -0400

    Merge branch 'bug20487_029' into maint-0.2.9

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