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

[nickm at torproject.org]

commit e6d84ac04fbebdbe64587b08594f42042417d92f
Merge: 68a27da 9248466
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 1 12:49:13 2016 -0400

    Merge branch 'maint-0.2.9'

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