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

[nickm at torproject.org]

commit c290053ac713451932b952e40067c7c4772181c5
Merge: f5ce44e caf7422
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 14 10:37:22 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 doc/tor.1.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)