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

[nickm at torproject.org]

commit c8ec42de2ffde174086ecf720ba8f6f20a5b0947
Merge: 0fed324 add164a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 6 16:41:32 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug19969 | 4 ++--
 changes/bug20472 | 3 ++-
 changes/bug20551 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)