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

[nickm at torproject.org]

commit d564187deedb9b8541ab8c83e6c4375ddda66149
Merge: c58592e e4ef9f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 8 19:25:44 2016 -0500

    Merge branch 'maint-0.2.9'

 changes/bug20085                    | 4 ++++
 src/config/torrc.minimal.in-staging | 2 +-
 src/config/torrc.sample.in          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)