diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-02 19:10:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-02 19:14:30 -0400 |
| commit | 8a79b56ac6709dfddaa15d9c76d0f856a502a6a1 (patch) | |
| tree | 36e96d625b6f62a386b3331d51df369138a7b923 /src/config/include.am | |
| parent | d19cbf3ab17a5afcbe0e94a16686e9ff9129dbfc (diff) | |
| download | tor-8a79b56ac6709dfddaa15d9c76d0f856a502a6a1.tar.gz tor-8a79b56ac6709dfddaa15d9c76d0f856a502a6a1.zip | |
Divide torrc.sample into torrc.sample and torrc.minimal
torrc.minimal is now the one that should change as infrequently as
possible. To schedule an change to go into it eventually, make your
change to torrc.minimal.in-sample.
torrc.sample is now the volatile one: we can change it to our hearts'
content.
Closes ticket #11144
Diffstat (limited to 'src/config/include.am')
| -rw-r--r-- | src/config/include.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/config/include.am b/src/config/include.am index 35961b829a..c283628513 100644 --- a/src/config/include.am +++ b/src/config/include.am @@ -2,7 +2,7 @@ confdir = $(sysconfdir)/tor tordatadir = $(datadir)/tor -EXTRA_DIST+= src/config/geoip src/config/geoip6 +EXTRA_DIST+= src/config/geoip src/config/geoip6 src/config/torrc.minimal.in # fallback-consensus conf_DATA = src/config/torrc.sample |