aboutsummaryrefslogtreecommitdiffstats
path: root/packages/torouter-web/src/config.py
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-17 19:31:22 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-17 19:31:22 +0200
commit57e54f969b840546925d16ceceb130a0f3927140 (patch)
treec2a498d35477d81161783e5eb8e7be726eebc0b0 /packages/torouter-web/src/config.py
parent702600566d00c495c418631cd64ee99839fea5a0 (diff)
parent525766e515148f9da5e78d39d1905264a4d14bad (diff)
downloadtorouter-57e54f969b840546925d16ceceb130a0f3927140.tar.gz
torouter-57e54f969b840546925d16ceceb130a0f3927140.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-web/src/config.py')
-rw-r--r--packages/torouter-web/src/config.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/torouter-web/src/config.py b/packages/torouter-web/src/config.py
index 8fd716d..15057df 100644
--- a/packages/torouter-web/src/config.py
+++ b/packages/torouter-web/src/config.py
@@ -12,4 +12,5 @@ globals = {}
authinfo = ("test", "test")
interfaces_file = os.getcwd() + "/../torouter-prep/configs/interfaces"
+torrc_file = os.getcwd() + "/../torouter-prep/configs/torrc"