Nick Mathewson 7c3f210e70 Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7 9 years ago
..
README 53fc782e49 add a README to src/config 9 years ago
geoip 62b02a1941 Update geoip and geoip6 to the October 9 2015 database. 9 years ago
geoip6 62b02a1941 Update geoip and geoip6 to the October 9 2015 database. 9 years ago
include.am 53fc782e49 add a README to src/config 9 years ago
mmdb-convert.py 613b0a3bc5 Merge remote-tracking branch 'karsten/geoip2regcountry' 10 years ago
torrc.minimal.in 8a79b56ac6 Divide torrc.sample into torrc.sample and torrc.minimal 10 years ago
torrc.minimal.in-staging 87dee5c651 Socks->SOCKS in torrcs. Fixes 15609 9 years ago
torrc.sample.in 87dee5c651 Socks->SOCKS in torrcs. Fixes 15609 9 years ago

README

This directory has configuration files that ship with Tor. They include:

geoip
geoip6

Geoip files for IPv4 and IPv6

torrc.minimal, torrc.sample:

generated from torrc.minimal.in and torrc.sample.in by autoconf.

torrc.minimal.in:

A very small torrc, suitable for installation by default in
/etc/tor/torrc.

We try to change torrc.minimal.in as infrequently as possible,
since doing so makes the users of many packages have to re-build
their torrc files.


torrc.minimal.in-staging

This is where we stage changes to torrc.minimal.in over time so
that when we have a change large enough to warrant a new
torrc.minimal.in, we can copy all the other changes over
wholesale.

torrc.sample.in:

A verbose, discursive, batteries-included torrc. Suitable for
letting people know how to set up various options, including those
most people shouldn't mess with.