diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-10 23:36:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-10 23:36:27 -0400 |
| commit | 5474d8ae05da1a7b896a12e5857b2dbe0b0b8ce6 (patch) | |
| tree | f21e1a1aa72be9d8f1ea1ee41bff914ecef51f92 /.gitignore | |
| parent | 916d53d6ceab5b3a5d567f18a2bce8543d008a89 (diff) | |
| parent | 9ab35b0a2e3e1e87ce67ad49febd79a14001d74c (diff) | |
| download | tor-5474d8ae05da1a7b896a12e5857b2dbe0b0b8ce6.tar.gz tor-5474d8ae05da1a7b896a12e5857b2dbe0b0b8ce6.zip | |
Merge remote-tracking branch 'public/torrc_minimal'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1a479903dc..ff614c7b00 100644 --- a/.gitignore +++ b/.gitignore @@ -135,6 +135,7 @@ cscope.* /src/config/sample-server-torrc /src/config/torrc /src/config/torrc.sample +/src/config/torrc.minimal # /src/or/ /src/or/Makefile |