[tor-commits] [chutney/master] Force authorities to vote Exit & Guard for all nodes

[nickm at torproject.org]

commit c18823e44b8ee6de3c1b7723fbc650a96810c082
Author: teor <teor2345 at gmail.com>
Date:   Thu Oct 2 02:07:19 2014 +1000

    Force authorities to vote Exit & Guard for all nodes
    
    Use the new tor TestingDirAuthVoteExit option, and the
    TestingDirAuthVoteGuard option, to make all authorities vote all relays
    (and authorities) as exits and guards. This ensures that tor's
    make test-network will work. But it's a sledgehammer approach.
    
    Requires either the new tor TestingDirAuthVoteExit option, or the
    issue-13161-check-torrc-options patch for chutney.
---
 torrc_templates/authority.tmpl |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/torrc_templates/authority.tmpl b/torrc_templates/authority.tmpl
index 7bf99af..eda123c 100644
--- a/torrc_templates/authority.tmpl
+++ b/torrc_templates/authority.tmpl
@@ -7,3 +7,13 @@ TestingV3AuthInitialVotingInterval 300
 TestingV3AuthInitialVoteDelay 2
 TestingV3AuthInitialDistDelay 2
 TestingV3AuthVotingStartOffset 0
+
+# Work around situations where the Exit and Guard flags aren't being set
+# These flags are set eventually, but it takes ~30 minutes
+# We could be more precise here, but it's easiest just to vote everything
+# Clients are sensible enough to filter out Exits without any exit ports, 
+# and Guards without ORPorts
+# If your tor doesn't recognise TestingDirAuthVoteExit, update your chutney
+# to a version that includes the issue-13161-check-torrc-options features
+TestingDirAuthVoteExit *
+TestingDirAuthVoteGuard *