[tor-commits] [tor/master] Merge remote-tracking branch 'public/torrc_minimal'

[nickm at torproject.org]

commit 5474d8ae05da1a7b896a12e5857b2dbe0b0b8ce6
Merge: 916d53d 9ab35b0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 10 23:36:27 2014 -0400

    Merge remote-tracking branch 'public/torrc_minimal'

 .gitignore                          |    1 +
 changes/ticket11144                 |    8 ++
 configure.ac                        |    1 +
 src/config/include.am               |    2 +-
 src/config/torrc.minimal.in         |  192 +++++++++++++++++++++++++++++++++++
 src/config/torrc.minimal.in-staging |  192 +++++++++++++++++++++++++++++++++++
 src/config/torrc.sample.in          |   10 +-
 7 files changed, 400 insertions(+), 6 deletions(-)