commit a18429127f214218ba17370518a04c35d557957b Author: Karsten Loesing karsten.loesing@gmx.net Date: Sat Sep 29 13:21:31 2012 -0400

Revert "Faravahar is actually all lower-case."

This reverts commit 4ef39d487722db99d8889b837aabcb4408c11101. --- src/org/torproject/doctor/Checker.java | 6 +++--- src/org/torproject/doctor/Downloader.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index 564195d..3f1276a 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -96,7 +96,7 @@ public class Checker { private void checkMissingConsensuses() { SortedSet<String> missingConsensuses = new TreeSet<String>( Arrays.asList(("gabelmoo,tor26,turtles,maatuska,dannenberg,urras," - + "moria1,dizum,faravahar").split(","))); + + "moria1,dizum,Faravahar").split(","))); missingConsensuses.removeAll(this.downloadedConsensuses.keySet()); if (!missingConsensuses.isEmpty()) { this.warnings.put(Warning.ConsensusDownloadTimeout, @@ -378,7 +378,7 @@ public class Checker { private void checkMissingVotes() { SortedSet<String> knownAuthorities = new TreeSet<String>( Arrays.asList(("dannenberg,dizum,gabelmoo,turtles,maatuska," - + "moria1,tor26,urras,faravahar").split(","))); + + "moria1,tor26,urras,Faravahar").split(","))); SortedSet<String> missingVotes = new TreeSet<String>(knownAuthorities); for (RelayNetworkStatusVote vote : this.downloadedVotes) { @@ -417,7 +417,7 @@ public class Checker { private void checkMissingAuthorities() { SortedSet<String> missingAuthorities = new TreeSet<String>( Arrays.asList(("gabelmoo,tor26,turtles,maatuska,dannenberg,urras," - + "moria1,dizum,faravahar,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 b060279..eb3e1a3 100644 --- a/src/org/torproject/doctor/Downloader.java +++ b/src/org/torproject/doctor/Downloader.java @@ -26,7 +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); + 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