[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit efff55bdfd45e1587d074430ffe5a8a775a35bf5
Merge: 8e93cfb c198195
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 29 10:22:38 2015 +0200

    Merge remote-tracking branch 'origin/maint-0.2.7'

 ChangeLog                           |    2 +-
 changes/bug15609                    |    2 ++
 src/config/torrc.minimal.in-staging |   20 ++++++++++----------
 src/config/torrc.sample.in          |   20 ++++++++++----------
 4 files changed, 23 insertions(+), 21 deletions(-)