From 3ecad7d8587298c8efd642dd5ec5ba26f7000946 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 11 Jul 2012 12:42:41 +0200
Subject: Add support for bridge authorities, bridge relays and clients using
 bridges.

---
 torrc_templates/bridge.tmpl          | 7 +++++++
 torrc_templates/bridgeauthority.tmpl | 6 ++++++
 torrc_templates/bridgeclient.tmpl    | 5 +++++
 torrc_templates/common.i             | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 torrc_templates/bridge.tmpl
 create mode 100644 torrc_templates/bridgeauthority.tmpl
 create mode 100644 torrc_templates/bridgeclient.tmpl

(limited to 'torrc_templates')

diff --git a/torrc_templates/bridge.tmpl b/torrc_templates/bridge.tmpl
new file mode 100644
index 0000000..0c1a622
--- /dev/null
+++ b/torrc_templates/bridge.tmpl
@@ -0,0 +1,7 @@
+${include:common.i}
+SocksPort 0
+OrPort $orport
+Address $ip
+BridgeRelay 1
+ExitPolicy reject *:*
+
diff --git a/torrc_templates/bridgeauthority.tmpl b/torrc_templates/bridgeauthority.tmpl
new file mode 100644
index 0000000..5598069
--- /dev/null
+++ b/torrc_templates/bridgeauthority.tmpl
@@ -0,0 +1,6 @@
+${include:relay.tmpl}
+AuthoritativeDirectory 1
+ContactInfo bridgeauth${nodenum}@test.test
+ExitPolicy reject *:*
+
+BridgeAuthoritativeDir 1
diff --git a/torrc_templates/bridgeclient.tmpl b/torrc_templates/bridgeclient.tmpl
new file mode 100644
index 0000000..f414718
--- /dev/null
+++ b/torrc_templates/bridgeclient.tmpl
@@ -0,0 +1,5 @@
+${include:client.tmpl}
+UseBridges 1
+UseMicrodescriptors 0 # Microdescriptors don't work well with bridge clients
+${bridges}
+
diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 18e22d9..2b5e4fa 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -9,5 +9,5 @@ Log notice file ${dir}/notice.log
 Log info file ${dir}/info.log
 ProtocolWarnings 1
 SafeLogging 0
-${dirservers}
+${authorities}
 
-- 
cgit v1.2.3