[tor-commits] [doctor/master] Add Faravahar as ninth directory authority.

[karsten at torproject.org]

commit dd39c5c4b117e56d47098f5aa273f642dd0ee152
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Sep 21 12:43:30 2012 -0400

    Add Faravahar as ninth directory authority.
---
 src/org/torproject/doctor/Checker.java    |    6 +++---
 src/org/torproject/doctor/Downloader.java |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java
index b562e57..9de06cb 100644
--- a/src/org/torproject/doctor/Checker.java
+++ b/src/org/torproject/doctor/Checker.java
@@ -94,7 +94,7 @@ public class Checker {
   private void checkMissingConsensuses() {
     SortedSet<String> missingConsensuses = new TreeSet<String>(
         Arrays.asList(("gabelmoo,tor26,turtles,maatuska,dannenberg,urras,"
-        + "moria1,dizum").split(",")));
+        + "moria1,dizum,Faravahar").split(",")));
     missingConsensuses.removeAll(this.downloadedConsensuses.keySet());
     if (!missingConsensuses.isEmpty()) {
       this.warnings.put(Warning.ConsensusDownloadTimeout,
@@ -353,7 +353,7 @@ public class Checker {
   private void checkMissingVotes() {
     SortedSet<String> knownAuthorities = new TreeSet<String>(
         Arrays.asList(("dannenberg,dizum,gabelmoo,turtles,maatuska,"
-        + "moria1,tor26,urras").split(",")));
+        + "moria1,tor26,urras,Faravahar").split(",")));
     SortedSet<String> missingVotes =
         new TreeSet<String>(knownAuthorities);
     for (RelayNetworkStatusVote vote : this.downloadedVotes) {
@@ -392,7 +392,7 @@ public class Checker {
   private void checkMissingAuthorities() {
     SortedSet<String> missingAuthorities = new TreeSet<String>(
         Arrays.asList(("gabelmoo,tor26,turtles,maatuska,dannenberg,urras,"
-        + "moria1,dizum,Tonga").split(",")));
+        + "moria1,dizum,Faravahar,Tonga").split(",")));
     for (NetworkStatusEntry entry :
         this.downloadedConsensus.getStatusEntries().values()) {
       if (entry.getFlags().contains("Authority")) {
diff --git a/src/org/torproject/doctor/Downloader.java b/src/org/torproject/doctor/Downloader.java
index 3295870..eb3e1a3 100644
--- a/src/org/torproject/doctor/Downloader.java
+++ b/src/org/torproject/doctor/Downloader.java
@@ -26,6 +26,7 @@ public class Downloader {
     downloader.addDirectoryAuthority("urras", "208.83.223.34", 443);
     downloader.addDirectoryAuthority("moria1", "128.31.0.34", 9131);
     downloader.addDirectoryAuthority("dizum", "194.109.206.212", 80);
+    downloader.addDirectoryAuthority("Faravahar", "154.35.32.5", 80);
 
     /* Instruct the downloader to include the current consensus and all
      * referenced votes in the downloads.  The consensus shall be