tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[onionoo/master] Change method visibility.
by karsten＠torproject.org 14 Apr '14

14 Apr '14

commit 25b8a065baf96e77f7b31d72f815f20a6678faec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 20 17:28:55 2014 +0100 Change method visibility. Found by SonarQube. --- src/org/torproject/onionoo/UptimeDocumentWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/onionoo/UptimeDocumentWriter.java b/src/org/torproject/onionoo/UptimeDocumentWriter.java index c53c709..ea6bd4e 100644 --- a/src/org/torproject/onionoo/UptimeDocumentWriter.java +++ b/src/org/torproject/onionoo/UptimeDocumentWriter.java @@ -25,7 +25,7 @@ public class UptimeDocumentWriter implements FingerprintListener, this.registerFingerprintListeners(); } - public void registerFingerprintListeners() { + private void registerFingerprintListeners() { this.descriptorSource.registerFingerprintListener(this, DescriptorType.RELAY_CONSENSUSES); this.descriptorSource.registerFingerprintListener(this,

1 0

[onionoo/master] Preserve stack trace.
by karsten＠torproject.org 14 Apr '14

14 Apr '14

commit 6390de503400426ceacb6535e2b37abd769ebb7c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 20 17:22:23 2014 +0100 Preserve stack trace. Found by SonarQube. --- src/org/torproject/onionoo/NodeStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/onionoo/NodeStatus.java b/src/org/torproject/onionoo/NodeStatus.java index 78a08c2..da39a5b 100644 --- a/src/org/torproject/onionoo/NodeStatus.java +++ b/src/org/torproject/onionoo/NodeStatus.java @@ -70,7 +70,7 @@ public class NodeStatus extends Document { this.fingerprint.toCharArray())).toUpperCase(); } catch (DecoderException e) { throw new IllegalArgumentException("Fingerprint '" + fingerprint - + "' is not a valid fingerprint."); + + "' is not a valid fingerprint.", e); } this.address = address; this.exitAddresses = new TreeSet<String>();

1 0

[onionoo/master] Remove unused attributes from Document classes.
by karsten＠torproject.org 14 Apr '14

14 Apr '14

commit 25556d9ad1fa77af89770c1506bd5a1516e9c432 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Apr 12 17:22:33 2014 +0200 Remove unused attributes from Document classes. --- src/org/torproject/onionoo/BandwidthDocument.java | 22 ------- src/org/torproject/onionoo/DetailsDocument.java | 63 --------------------- src/org/torproject/onionoo/SummaryDocument.java | 19 ------- src/org/torproject/onionoo/WeightsDocument.java | 25 -------- 4 files changed, 129 deletions(-) diff --git a/src/org/torproject/onionoo/BandwidthDocument.java b/src/org/torproject/onionoo/BandwidthDocument.java index 01b87de..3f1a07f 100644 --- a/src/org/torproject/onionoo/BandwidthDocument.java +++ b/src/org/torproject/onionoo/BandwidthDocument.java @@ -2,29 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.onionoo; -import java.util.List; -import java.util.Map; - class BandwidthDocument extends Document { - class BandwidthHistory { - String first; - String last; - Integer interval; - Double factor; - Integer count; - List<Integer> values; - } - - class NodeBandwidth { - String fingerprint; - Map<String, BandwidthHistory> write_history; - Map<String, BandwidthHistory> read_history; - } - - String relays_published; - List<NodeBandwidth> relays; - String bridges_published; - List<NodeBandwidth> bridges; } diff --git a/src/org/torproject/onionoo/DetailsDocument.java b/src/org/torproject/onionoo/DetailsDocument.java index 9b81bbd..b51b6cd 100644 --- a/src/org/torproject/onionoo/DetailsDocument.java +++ b/src/org/torproject/onionoo/DetailsDocument.java @@ -2,70 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.onionoo; -import java.util.List; - class DetailsDocument extends Document { - class ExitPolicySummary { - List<String> reject; - List<String> accept; - } - - class RelayDetails { - String nickname; - String fingerprint; - List<String> or_addresses; - List<String> exit_addresses; - String dir_address; - String last_seen; - String last_changed_address_or_port; - String first_seen; - Boolean running; - List<String> flags; - String country; - String country_name; - String region_name; - String city_name; - Double latitude; - Double longitude; - String as_number; - String as_name; - Double consensus_weight; - String host_name; - String last_restarted; - Integer bandwidth_rate; - Integer bandwidth_burst; - Integer observed_bandwidth; - Integer advertised_bandwidth; - List<String> exit_policy; - ExitPolicySummary exit_policy_summary; - String contact; - String platform; - List<String> family; - Double advertised_bandwidth_fraction; - Double consensus_weight_fraction; - Double guard_probability; - Double middle_probability; - Double exit_probability; - } - - class BridgeDetails { - String nickname; - String hashed_fingerprint; - List<String> or_addresses; - String last_seen; - String first_seen; - Boolean running; - List<String> flags; - String last_restarted; - Integer advertised_bandwidth; - String platform; - String pool_assignment; - } - - String relays_published; - List<RelayDetails> relays; - String bridges_published; - List<BridgeDetails> bridges; } diff --git a/src/org/torproject/onionoo/SummaryDocument.java b/src/org/torproject/onionoo/SummaryDocument.java index e0aadb5..63862a2 100644 --- a/src/org/torproject/onionoo/SummaryDocument.java +++ b/src/org/torproject/onionoo/SummaryDocument.java @@ -2,26 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.onionoo; -import java.util.List; - class SummaryDocument extends Document { - class RelaySummary { - String n; - String f; - String[] a; - Boolean r; - } - - class BridgeSummary { - String n; - String h; - Boolean r; - } - - String relays_published; - List<RelaySummary> relays; - String bridges_published; - List<BridgeSummary> bridges; } diff --git a/src/org/torproject/onionoo/WeightsDocument.java b/src/org/torproject/onionoo/WeightsDocument.java index 6739333..af920f0 100644 --- a/src/org/torproject/onionoo/WeightsDocument.java +++ b/src/org/torproject/onionoo/WeightsDocument.java @@ -1,31 +1,6 @@ package org.torproject.onionoo; -import java.util.List; -import java.util.Map; - class WeightsDocument extends Document { - class WeightsHistory { - String first; - String last; - Integer interval; - Double factor; - Integer count; - List<Integer> values; - } - - class NodeWeights { - String fingerprint; - Map<String, WeightsHistory> advertised_bandwidth_fraction; - Map<String, WeightsHistory> consensus_weight_fraction; - Map<String, WeightsHistory> guard_probability; - Map<String, WeightsHistory> middle_probability; - Map<String, WeightsHistory> exit_probability; - } - - String relays_published; - List<NodeWeights> relays; - String bridges_published; - List<NodeWeights> bridges; }

1 0

[onionoo/master] Move date and time constants to single place.
by karsten＠torproject.org 14 Apr '14

14 Apr '14

commit f4492310fa24fd1be115e07acf0b392a829046e2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 8 23:22:35 2014 +0200 Move date and time constants to single place. Suggested by SonarQube to avoid magic numbers. --- .../onionoo/BandwidthDocumentWriter.java | 33 +++++++++-------- .../torproject/onionoo/BandwidthStatusUpdater.java | 28 ++++++++------ .../torproject/onionoo/ClientsDocumentWriter.java | 30 +++++++-------- .../torproject/onionoo/ClientsStatusUpdater.java | 24 ++++++------ src/org/torproject/onionoo/DateTimeHelper.java | 19 ++++++++++ src/org/torproject/onionoo/DocumentStore.java | 2 +- src/org/torproject/onionoo/Logger.java | 4 +- .../onionoo/NodeDetailsStatusUpdater.java | 6 ++- src/org/torproject/onionoo/ResponseBuilder.java | 2 +- .../onionoo/ReverseDomainNameResolver.java | 11 +++--- .../torproject/onionoo/UptimeDocumentWriter.java | 39 ++++++++++---------- .../torproject/onionoo/UptimeStatusUpdater.java | 15 ++++---- .../torproject/onionoo/WeightsDocumentWriter.java | 23 ++++++------ .../torproject/onionoo/WeightsStatusUpdater.java | 27 ++++++++------ 14 files changed, 146 insertions(+), 117 deletions(-) diff --git a/src/org/torproject/onionoo/BandwidthDocumentWriter.java b/src/org/torproject/onionoo/BandwidthDocumentWriter.java index 68912c7..0c7308e 100644 --- a/src/org/torproject/onionoo/BandwidthDocumentWriter.java +++ b/src/org/torproject/onionoo/BandwidthDocumentWriter.java @@ -77,20 +77,20 @@ public class BandwidthDocumentWriter implements FingerprintListener, "5_years" }; private long[] graphIntervals = new long[] { - 72L * 60L * 60L * 1000L, - 7L * 24L * 60L * 60L * 1000L, - 31L * 24L * 60L * 60L * 1000L, - 92L * 24L * 60L * 60L * 1000L, - 366L * 24L * 60L * 60L * 1000L, - 5L * 366L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.THREE_DAYS, + DateTimeHelper.ONE_WEEK, + DateTimeHelper.ROUGHLY_ONE_MONTH, + DateTimeHelper.ROUGHLY_THREE_MONTHS, + DateTimeHelper.ROUGHLY_ONE_YEAR, + DateTimeHelper.ROUGHLY_FIVE_YEARS }; private long[] dataPointIntervals = new long[] { - 15L * 60L * 1000L, - 60L * 60L * 1000L, - 4L * 60L * 60L * 1000L, - 12L * 60L * 60L * 1000L, - 2L * 24L * 60L * 60L * 1000L, - 10L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.FIFTEEN_MINUTES, + DateTimeHelper.ONE_HOUR, + DateTimeHelper.FOUR_HOURS, + DateTimeHelper.TWELVE_HOURS, + DateTimeHelper.TWO_DAYS, + DateTimeHelper.TEN_DAYS }; private String formatHistoryString(SortedMap<Long, long[]> history) { StringBuilder sb = new StringBuilder(); @@ -110,7 +110,8 @@ public class BandwidthDocumentWriter implements FingerprintListener, while ((intervalStartMillis / dataPointInterval) != (endMillis / dataPointInterval)) { dataPoints.add(totalMillis * 5L < dataPointInterval - ? -1L : (totalBandwidth * 1000L) / totalMillis); + ? -1L : (totalBandwidth * DateTimeHelper.ONE_SECOND) + / totalMillis); totalBandwidth = 0L; totalMillis = 0L; intervalStartMillis += dataPointInterval; @@ -119,7 +120,8 @@ public class BandwidthDocumentWriter implements FingerprintListener, totalMillis += (endMillis - startMillis); } dataPoints.add(totalMillis * 5L < dataPointInterval - ? -1L : (totalBandwidth * 1000L) / totalMillis); + ? -1L : (totalBandwidth * DateTimeHelper.ONE_SECOND) + / totalMillis); long maxValue = 1L; int firstNonNullIndex = -1, lastNonNullIndex = -1; for (int j = 0; j < dataPoints.size(); j++) { @@ -157,7 +159,8 @@ public class BandwidthDocumentWriter implements FingerprintListener, + DateTimeHelper.format(firstDataPointMillis) + "\"," + "\"last\":\"" + DateTimeHelper.format(lastDataPointMillis) + "\"," - +"\"interval\":" + String.valueOf(dataPointInterval / 1000L) + + "\"interval\":" + String.valueOf(dataPointInterval + / DateTimeHelper.ONE_SECOND) + ",\"factor\":" + String.format(Locale.US, "%.3f", factor) + ",\"count\":" + String.valueOf(count) + ",\"values\":["); int written = 0, previousNonNullIndex = -2; diff --git a/src/org/torproject/onionoo/BandwidthStatusUpdater.java b/src/org/torproject/onionoo/BandwidthStatusUpdater.java index cce56bc..6aff25d 100644 --- a/src/org/torproject/onionoo/BandwidthStatusUpdater.java +++ b/src/org/torproject/onionoo/BandwidthStatusUpdater.java @@ -74,7 +74,8 @@ public class BandwidthStatusUpdater implements DescriptorListener, + "'. Skipping."); return; } - long intervalMillis = Long.parseLong(parts[3].substring(1)) * 1000L; + long intervalMillis = Long.parseLong(parts[3].substring(1)) + * DateTimeHelper.ONE_SECOND; String[] values = parts[5].split(","); for (int i = values.length - 1; i >= 0; i--) { long bandwidthValue = Long.parseLong(values[i]); @@ -96,18 +97,21 @@ public class BandwidthStatusUpdater implements DescriptorListener, for (long[] v : uncompressedHistory.values()) { long startMillis = v[0], endMillis = v[1], bandwidth = v[2]; long intervalLengthMillis; - if (this.now - endMillis <= 72L * 60L * 60L * 1000L) { - intervalLengthMillis = 15L * 60L * 1000L; - } else if (this.now - endMillis <= 7L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 60L * 60L * 1000L; - } else if (this.now - endMillis <= 31L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 4L * 60L * 60L * 1000L; - } else if (this.now - endMillis <= 92L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 12L * 60L * 60L * 1000L; - } else if (this.now - endMillis <= 366L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 2L * 24L * 60L * 60L * 1000L; + if (this.now - endMillis <= DateTimeHelper.THREE_DAYS) { + intervalLengthMillis = DateTimeHelper.FIFTEEN_MINUTES; + } else if (this.now - endMillis <= DateTimeHelper.ONE_WEEK) { + intervalLengthMillis = DateTimeHelper.ONE_HOUR; + } else if (this.now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_MONTH) { + intervalLengthMillis = DateTimeHelper.FOUR_HOURS; + } else if (this.now - endMillis <= + DateTimeHelper.ROUGHLY_THREE_MONTHS) { + intervalLengthMillis = DateTimeHelper.TWELVE_HOURS; + } else if (this.now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_YEAR) { + intervalLengthMillis = DateTimeHelper.TWO_DAYS; } else { - intervalLengthMillis = 10L * 24L * 60L * 60L * 1000L; + intervalLengthMillis = DateTimeHelper.TEN_DAYS; } String monthString = DateTimeHelper.format(startMillis, DateTimeHelper.ISO_YEARMONTH_FORMAT); diff --git a/src/org/torproject/onionoo/ClientsDocumentWriter.java b/src/org/torproject/onionoo/ClientsDocumentWriter.java index fe400d2..d9ff02d 100644 --- a/src/org/torproject/onionoo/ClientsDocumentWriter.java +++ b/src/org/torproject/onionoo/ClientsDocumentWriter.java @@ -92,18 +92,18 @@ public class ClientsDocumentWriter implements FingerprintListener, "5_years" }; private long[] graphIntervals = new long[] { - 7L * 24L * 60L * 60L * 1000L, - 31L * 24L * 60L * 60L * 1000L, - 92L * 24L * 60L * 60L * 1000L, - 366L * 24L * 60L * 60L * 1000L, - 5L * 366L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.ONE_WEEK, + DateTimeHelper.ROUGHLY_ONE_MONTH, + DateTimeHelper.ROUGHLY_THREE_MONTHS, + DateTimeHelper.ROUGHLY_ONE_YEAR, + DateTimeHelper.ROUGHLY_FIVE_YEARS }; private long[] dataPointIntervals = new long[] { - 24L * 60L * 60L * 1000L, - 24L * 60L * 60L * 1000L, - 24L * 60L * 60L * 1000L, - 2L * 24L * 60L * 60L * 1000L, - 10L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.ONE_DAY, + DateTimeHelper.ONE_DAY, + DateTimeHelper.ONE_DAY, + DateTimeHelper.TWO_DAYS, + DateTimeHelper.TEN_DAYS }; private String formatHistoryString(String hashedFingerprint, SortedSet<ClientsHistory> history) { @@ -124,9 +124,6 @@ public class ClientsDocumentWriter implements FingerprintListener, return sb.toString(); } - private static final long ONE_HOUR_MILLIS = 60L * 60L * 1000L, - ONE_DAY_MILLIS = 24L * ONE_HOUR_MILLIS; - private String formatTimeline(int graphIntervalIndex, SortedSet<ClientsHistory> history) { String graphName = this.graphNames[graphIntervalIndex]; @@ -149,7 +146,7 @@ public class ClientsDocumentWriter implements FingerprintListener, while ((intervalStartMillis / dataPointInterval) != (hist.endMillis / dataPointInterval)) { dataPoints.add(millis * 2L < dataPointInterval - ? -1.0 : responses * ((double) ONE_DAY_MILLIS) + ? -1.0 : responses * ((double) DateTimeHelper.ONE_DAY) / (((double) millis) * 10.0)); responses = 0.0; millis = 0L; @@ -184,7 +181,7 @@ public class ClientsDocumentWriter implements FingerprintListener, millis += (hist.endMillis - hist.startMillis); } dataPoints.add(millis * 2L < dataPointInterval - ? -1.0 : responses * ((double) ONE_DAY_MILLIS) + ? -1.0 : responses * ((double) DateTimeHelper.ONE_DAY) / (((double) millis) * 10.0)); double maxValue = 0.0; int firstNonNullIndex = -1, lastNonNullIndex = -1; @@ -222,7 +219,8 @@ public class ClientsDocumentWriter implements FingerprintListener, sb.append("\"" + graphName + "\":{" + "\"first\":\"" + DateTimeHelper.format(firstDataPointMillis) + "\",\"last\":\"" + DateTimeHelper.format(lastDataPointMillis) - + "\",\"interval\":" + String.valueOf(dataPointInterval / 1000L) + + "\",\"interval\":" + String.valueOf(dataPointInterval + / DateTimeHelper.ONE_SECOND) + ",\"factor\":" + String.format(Locale.US, "%.9f", factor) + ",\"count\":" + String.valueOf(count) + ",\"values\":["); int dataPointsWritten = 0, previousNonNullIndex = -2; diff --git a/src/org/torproject/onionoo/ClientsStatusUpdater.java b/src/org/torproject/onionoo/ClientsStatusUpdater.java index 0ce550f..8a98ccf 100644 --- a/src/org/torproject/onionoo/ClientsStatusUpdater.java +++ b/src/org/torproject/onionoo/ClientsStatusUpdater.java @@ -58,9 +58,6 @@ public class ClientsStatusUpdater implements DescriptorListener, } } - private static final long ONE_HOUR_MILLIS = 60L * 60L * 1000L, - ONE_DAY_MILLIS = 24L * ONE_HOUR_MILLIS; - private SortedMap<String, SortedSet<ClientsHistory>> newResponses = new TreeMap<String, SortedSet<ClientsHistory>>(); @@ -68,10 +65,11 @@ public class ClientsStatusUpdater implements DescriptorListener, ExtraInfoDescriptor descriptor) { long dirreqStatsEndMillis = descriptor.getDirreqStatsEndMillis(); long dirreqStatsIntervalLengthMillis = - descriptor.getDirreqStatsIntervalLength() * 1000L; + descriptor.getDirreqStatsIntervalLength() + * DateTimeHelper.ONE_SECOND; SortedMap<String, Integer> responses = descriptor.getDirreqV3Resp(); if (dirreqStatsEndMillis < 0L || - dirreqStatsIntervalLengthMillis != ONE_DAY_MILLIS || + dirreqStatsIntervalLengthMillis != DateTimeHelper.ONE_DAY || responses == null || !responses.containsKey("ok")) { return; } @@ -82,8 +80,8 @@ public class ClientsStatusUpdater implements DescriptorListener, String hashedFingerprint = descriptor.getFingerprint().toUpperCase(); long dirreqStatsStartMillis = dirreqStatsEndMillis - dirreqStatsIntervalLengthMillis; - long utcBreakMillis = (dirreqStatsEndMillis / ONE_DAY_MILLIS) - * ONE_DAY_MILLIS; + long utcBreakMillis = (dirreqStatsEndMillis / DateTimeHelper.ONE_DAY) + * DateTimeHelper.ONE_DAY; for (int i = 0; i < 2; i++) { long startMillis = i == 0 ? dirreqStatsStartMillis : utcBreakMillis; long endMillis = i == 0 ? utcBreakMillis : dirreqStatsEndMillis; @@ -92,7 +90,7 @@ public class ClientsStatusUpdater implements DescriptorListener, } double totalResponses = okResponses * ((double) (endMillis - startMillis)) - / ((double) ONE_DAY_MILLIS); + / ((double) DateTimeHelper.ONE_DAY); SortedMap<String, Double> responsesByCountry = this.weightResponsesWithUniqueIps(totalResponses, descriptor.getBridgeIps(), "??"); @@ -179,13 +177,13 @@ public class ClientsStatusUpdater implements DescriptorListener, for (ClientsHistory responses : history) { long intervalLengthMillis; if (this.now - responses.endMillis <= - 92L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 24L * 60L * 60L * 1000L; + DateTimeHelper.ROUGHLY_THREE_MONTHS) { + intervalLengthMillis = DateTimeHelper.ONE_DAY; } else if (this.now - responses.endMillis <= - 366L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 2L * 24L * 60L * 60L * 1000L; + DateTimeHelper.ROUGHLY_ONE_YEAR) { + intervalLengthMillis = DateTimeHelper.TWO_DAYS; } else { - intervalLengthMillis = 10L * 24L * 60L * 60L * 1000L; + intervalLengthMillis = DateTimeHelper.TEN_DAYS; } String monthString = DateTimeHelper.format(responses.startMillis, DateTimeHelper.ISO_YEARMONTH_FORMAT); diff --git a/src/org/torproject/onionoo/DateTimeHelper.java b/src/org/torproject/onionoo/DateTimeHelper.java index efe126b..fb0c00d 100644 --- a/src/org/torproject/onionoo/DateTimeHelper.java +++ b/src/org/torproject/onionoo/DateTimeHelper.java @@ -14,6 +14,25 @@ public class DateTimeHelper { private DateTimeHelper() { } + public static final long ONE_SECOND = 1000L, + TEN_SECONDS = 10L * ONE_SECOND, + ONE_MINUTE = 60L * ONE_SECOND, + FIVE_MINUTES = 5L * ONE_MINUTE, + FIFTEEN_MINUTES = 15L * ONE_MINUTE, + ONE_HOUR = 60L * ONE_MINUTE, + FOUR_HOURS = 4L * ONE_HOUR, + SIX_HOURS = 6L * ONE_HOUR, + TWELVE_HOURS = 12L * ONE_HOUR, + ONE_DAY = 24L * ONE_HOUR, + TWO_DAYS = 2L * ONE_DAY, + THREE_DAYS = 3L * ONE_DAY, + ONE_WEEK = 7L * ONE_DAY, + TEN_DAYS = 10L * ONE_DAY, + ROUGHLY_ONE_MONTH = 31L * ONE_DAY, + ROUGHLY_THREE_MONTHS = 92L * ONE_DAY, + ROUGHLY_ONE_YEAR = 366L * ONE_DAY, + ROUGHLY_FIVE_YEARS = 5L * ROUGHLY_ONE_YEAR; + public static final String ISO_DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; public static final String ISO_DATETIME_TAB_FORMAT = diff --git a/src/org/torproject/onionoo/DocumentStore.java b/src/org/torproject/onionoo/DocumentStore.java index a91f302..46b5d98 100644 --- a/src/org/torproject/onionoo/DocumentStore.java +++ b/src/org/torproject/onionoo/DocumentStore.java @@ -484,7 +484,7 @@ public class DocumentStore { maxLastSeenMillis = node.getLastSeenMillis(); } } - cutoff = maxLastSeenMillis - 7L * 24L * 60L * 60L * 1000L; + cutoff = maxLastSeenMillis - DateTimeHelper.ONE_WEEK; } for (Map.Entry<String, NodeStatus> e : this.cachedNodeStatuses.entrySet()) { diff --git a/src/org/torproject/onionoo/Logger.java b/src/org/torproject/onionoo/Logger.java index ccc7962..5ae9be1 100644 --- a/src/org/torproject/onionoo/Logger.java +++ b/src/org/torproject/onionoo/Logger.java @@ -29,7 +29,9 @@ public class Logger { public static String formatMillis(long millis) { return String.format("%02d:%02d.%03d minutes", - millis / (1000L * 60L), (millis / 1000L) % 60L, millis % 1000L); + millis / DateTimeHelper.ONE_MINUTE, + (millis % DateTimeHelper.ONE_MINUTE) / DateTimeHelper.ONE_SECOND, + millis % DateTimeHelper.ONE_SECOND); } public static String formatBytes(long bytes) { diff --git a/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java b/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java index aa245dc..d6cd2ec 100644 --- a/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java +++ b/src/org/torproject/onionoo/NodeDetailsStatusUpdater.java @@ -308,7 +308,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } StringBuilder sb = new StringBuilder(); String lastRestartedString = DateTimeHelper.format( - descriptor.getPublishedMillis() - descriptor.getUptime() * 1000L); + descriptor.getPublishedMillis() - descriptor.getUptime() + * DateTimeHelper.ONE_SECOND); int bandwidthRate = descriptor.getBandwidthRate(); int bandwidthBurst = descriptor.getBandwidthBurst(); int observedBandwidth = descriptor.getBandwidthObserved(); @@ -392,7 +393,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } StringBuilder sb = new StringBuilder(); String lastRestartedString = DateTimeHelper.format( - descriptor.getPublishedMillis() - descriptor.getUptime() * 1000L); + descriptor.getPublishedMillis() - descriptor.getUptime() + * DateTimeHelper.ONE_SECOND); int advertisedBandwidth = Math.min(descriptor.getBandwidthRate(), Math.min(descriptor.getBandwidthBurst(), descriptor.getBandwidthObserved())); diff --git a/src/org/torproject/onionoo/ResponseBuilder.java b/src/org/torproject/onionoo/ResponseBuilder.java index 73ce683..bde8961 100644 --- a/src/org/torproject/onionoo/ResponseBuilder.java +++ b/src/org/torproject/onionoo/ResponseBuilder.java @@ -31,7 +31,7 @@ public class ResponseBuilder { private static SortedMap<Integer, Set<String>> relaysByFirstSeenDays = null, bridgesByFirstSeenDays = null, relaysByLastSeenDays = null, bridgesByLastSeenDays = null; - private static final long SUMMARY_MAX_AGE = 6L * 60L * 60L * 1000L; + private static final long SUMMARY_MAX_AGE = DateTimeHelper.SIX_HOURS; public static void initialize(DocumentStore documentStoreParam, Time timeParam) { diff --git a/src/org/torproject/onionoo/ReverseDomainNameResolver.java b/src/org/torproject/onionoo/ReverseDomainNameResolver.java index 586da35..7f14460 100644 --- a/src/org/torproject/onionoo/ReverseDomainNameResolver.java +++ b/src/org/torproject/onionoo/ReverseDomainNameResolver.java @@ -89,11 +89,12 @@ public class ReverseDomainNameResolver { this.time = time; } - private static final long RDNS_LOOKUP_MAX_REQUEST_MILLIS = 10L * 1000L; - private static final long RDNS_LOOKUP_MAX_DURATION_MILLIS = 5L * 60L - * 1000L; - private static final long RDNS_LOOKUP_MAX_AGE_MILLIS = 12L * 60L * 60L - * 1000L; + private static final long RDNS_LOOKUP_MAX_REQUEST_MILLIS = + DateTimeHelper.TEN_SECONDS; + private static final long RDNS_LOOKUP_MAX_DURATION_MILLIS = + DateTimeHelper.FIVE_MINUTES; + private static final long RDNS_LOOKUP_MAX_AGE_MILLIS = + DateTimeHelper.TWELVE_HOURS; private static final int RDNS_LOOKUP_WORKERS_NUM = 5; private Map<String, Long> addressLastLookupTimes; diff --git a/src/org/torproject/onionoo/UptimeDocumentWriter.java b/src/org/torproject/onionoo/UptimeDocumentWriter.java index ea6bd4e..06fde0f 100644 --- a/src/org/torproject/onionoo/UptimeDocumentWriter.java +++ b/src/org/torproject/onionoo/UptimeDocumentWriter.java @@ -32,8 +32,6 @@ public class UptimeDocumentWriter implements FingerprintListener, DescriptorType.BRIDGE_STATUSES); } - private static final long ONE_HOUR_MILLIS = 60L * 60L * 1000L; - private SortedSet<String> newRelayFingerprints = new TreeSet<String>(), newBridgeFingerprints = new TreeSet<String>(); @@ -96,18 +94,18 @@ public class UptimeDocumentWriter implements FingerprintListener, "5_years" }; private long[] graphIntervals = new long[] { - 7L * 24L * 60L * 60L * 1000L, - 31L * 24L * 60L * 60L * 1000L, - 92L * 24L * 60L * 60L * 1000L, - 366L * 24L * 60L * 60L * 1000L, - 5L * 366L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.ONE_WEEK, + DateTimeHelper.ROUGHLY_ONE_MONTH, + DateTimeHelper.ROUGHLY_THREE_MONTHS, + DateTimeHelper.ROUGHLY_ONE_YEAR, + DateTimeHelper.ROUGHLY_FIVE_YEARS }; private long[] dataPointIntervals = new long[] { - 60L * 60L * 1000L, - 4L * 60L * 60L * 1000L, - 12L * 60L * 60L * 1000L, - 2L * 24L * 60L * 60L * 1000L, - 10L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.ONE_HOUR, + DateTimeHelper.FOUR_HOURS, + DateTimeHelper.TWELVE_HOURS, + DateTimeHelper.TWO_DAYS, + DateTimeHelper.TEN_DAYS }; private String formatHistoryString(boolean relay, String fingerprint, SortedSet<UptimeHistory> history, @@ -138,7 +136,7 @@ public class UptimeDocumentWriter implements FingerprintListener, long dataPointInterval = this.dataPointIntervals[graphIntervalIndex]; int dataPointIntervalHours = (int) (dataPointInterval - / ONE_HOUR_MILLIS); + / DateTimeHelper.ONE_HOUR); List<Integer> statusDataPoints = new ArrayList<Integer>(); long intervalStartMillis = ((this.now - graphInterval) / dataPointInterval) * dataPointInterval; @@ -147,7 +145,7 @@ public class UptimeDocumentWriter implements FingerprintListener, if (hist.relay != relay) { continue; } - long histEndMillis = hist.startMillis + ONE_HOUR_MILLIS + long histEndMillis = hist.startMillis + DateTimeHelper.ONE_HOUR * hist.uptimeHours; if (histEndMillis < intervalStartMillis) { continue; @@ -162,14 +160,14 @@ public class UptimeDocumentWriter implements FingerprintListener, while (histEndMillis >= intervalStartMillis + dataPointInterval) { statusHours += (int) ((intervalStartMillis + dataPointInterval - Math.max(hist.startMillis, intervalStartMillis)) - / ONE_HOUR_MILLIS); + / DateTimeHelper.ONE_HOUR); statusDataPoints.add(statusHours * 5 > dataPointIntervalHours ? statusHours : -1); statusHours = 0; intervalStartMillis += dataPointInterval; } statusHours += (int) ((histEndMillis - Math.max(hist.startMillis, - intervalStartMillis)) / ONE_HOUR_MILLIS); + intervalStartMillis)) / DateTimeHelper.ONE_HOUR); } statusDataPoints.add(statusHours * 5 > dataPointIntervalHours ? statusHours : -1); @@ -185,7 +183,7 @@ public class UptimeDocumentWriter implements FingerprintListener, if (firstStatusStartMillis < 0L) { firstStatusStartMillis = hist.startMillis; } - long histEndMillis = hist.startMillis + ONE_HOUR_MILLIS + long histEndMillis = hist.startMillis + DateTimeHelper.ONE_HOUR * hist.uptimeHours; if (histEndMillis < intervalStartMillis) { continue; @@ -204,13 +202,13 @@ public class UptimeDocumentWriter implements FingerprintListener, while (histEndMillis >= intervalStartMillis + dataPointInterval) { uptimeHours += (int) ((intervalStartMillis + dataPointInterval - Math.max(hist.startMillis, intervalStartMillis)) - / ONE_HOUR_MILLIS); + / DateTimeHelper.ONE_HOUR); uptimeDataPoints.add(uptimeHours); uptimeHours = 0; intervalStartMillis += dataPointInterval; } uptimeHours += (int) ((histEndMillis - Math.max(hist.startMillis, - intervalStartMillis)) / ONE_HOUR_MILLIS); + intervalStartMillis)) / DateTimeHelper.ONE_HOUR); } uptimeDataPoints.add(uptimeHours); List<Double> dataPoints = new ArrayList<Double>(); @@ -258,7 +256,8 @@ public class UptimeDocumentWriter implements FingerprintListener, sb.append("\"" + graphName + "\":{" + "\"first\":\"" + DateTimeHelper.format(firstDataPointMillis) + "\",\"last\":\"" + DateTimeHelper.format(lastDataPointMillis) - + "\",\"interval\":" + String.valueOf(dataPointInterval / 1000L) + + "\",\"interval\":" + String.valueOf(dataPointInterval + / DateTimeHelper.ONE_SECOND) + ",\"factor\":" + String.format(Locale.US, "%.9f", factor) + ",\"count\":" + String.valueOf(count) + ",\"values\":["); int dataPointsWritten = 0, previousNonNullIndex = -2; diff --git a/src/org/torproject/onionoo/UptimeStatusUpdater.java b/src/org/torproject/onionoo/UptimeStatusUpdater.java index 30ab703..7bf20e5 100644 --- a/src/org/torproject/onionoo/UptimeStatusUpdater.java +++ b/src/org/torproject/onionoo/UptimeStatusUpdater.java @@ -50,8 +50,6 @@ public class UptimeStatusUpdater implements DescriptorListener, newRunningRelays = new TreeMap<String, SortedSet<Long>>(), newRunningBridges = new TreeMap<String, SortedSet<Long>>(); - private static final long ONE_HOUR_MILLIS = 60L * 60L * 1000L; - private void processRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) { SortedSet<String> fingerprints = new TreeSet<String>(); @@ -63,7 +61,7 @@ public class UptimeStatusUpdater implements DescriptorListener, } if (!fingerprints.isEmpty()) { long dateHourMillis = (consensus.getValidAfterMillis() - / ONE_HOUR_MILLIS) * ONE_HOUR_MILLIS; + / DateTimeHelper.ONE_HOUR) * DateTimeHelper.ONE_HOUR; for (String fingerprint : fingerprints) { if (!this.newRunningRelays.containsKey(fingerprint)) { this.newRunningRelays.put(fingerprint, new TreeSet<Long>()); @@ -84,7 +82,7 @@ public class UptimeStatusUpdater implements DescriptorListener, } if (!fingerprints.isEmpty()) { long dateHourMillis = (status.getPublishedMillis() - / ONE_HOUR_MILLIS) * ONE_HOUR_MILLIS; + / DateTimeHelper.ONE_HOUR) * DateTimeHelper.ONE_HOUR; for (String fingerprint : fingerprints) { if (!this.newRunningBridges.containsKey(fingerprint)) { this.newRunningBridges.put(fingerprint, new TreeSet<Long>()); @@ -134,15 +132,16 @@ public class UptimeStatusUpdater implements DescriptorListener, if (!history.headSet(interval).isEmpty()) { UptimeHistory prev = history.headSet(interval).last(); if (prev.relay == interval.relay && - prev.startMillis + ONE_HOUR_MILLIS * prev.uptimeHours > - interval.startMillis) { + prev.startMillis + DateTimeHelper.ONE_HOUR + * prev.uptimeHours > interval.startMillis) { continue; } } if (!history.tailSet(interval).isEmpty()) { UptimeHistory next = history.tailSet(interval).first(); if (next.relay == interval.relay && - next.startMillis < interval.startMillis + ONE_HOUR_MILLIS) { + next.startMillis < interval.startMillis + + DateTimeHelper.ONE_HOUR) { continue; } } @@ -157,7 +156,7 @@ public class UptimeStatusUpdater implements DescriptorListener, UptimeHistory lastInterval = null; for (UptimeHistory interval : history) { if (lastInterval != null && - lastInterval.startMillis + ONE_HOUR_MILLIS + lastInterval.startMillis + DateTimeHelper.ONE_HOUR * lastInterval.uptimeHours == interval.startMillis && lastInterval.relay == interval.relay) { lastInterval.addUptime(interval); diff --git a/src/org/torproject/onionoo/WeightsDocumentWriter.java b/src/org/torproject/onionoo/WeightsDocumentWriter.java index 6e225f1..83fe872 100644 --- a/src/org/torproject/onionoo/WeightsDocumentWriter.java +++ b/src/org/torproject/onionoo/WeightsDocumentWriter.java @@ -80,18 +80,18 @@ public class WeightsDocumentWriter implements FingerprintListener, "5_years" }; private long[] graphIntervals = new long[] { - 7L * 24L * 60L * 60L * 1000L, - 31L * 24L * 60L * 60L * 1000L, - 92L * 24L * 60L * 60L * 1000L, - 366L * 24L * 60L * 60L * 1000L, - 5L * 366L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.ONE_WEEK, + DateTimeHelper.ROUGHLY_ONE_MONTH, + DateTimeHelper.ROUGHLY_THREE_MONTHS, + DateTimeHelper.ROUGHLY_ONE_YEAR, + DateTimeHelper.ROUGHLY_FIVE_YEARS }; private long[] dataPointIntervals = new long[] { - 60L * 60L * 1000L, - 4L * 60L * 60L * 1000L, - 12L * 60L * 60L * 1000L, - 2L * 24L * 60L * 60L * 1000L, - 10L * 24L * 60L * 60L * 1000L }; + DateTimeHelper.ONE_HOUR, + DateTimeHelper.FOUR_HOURS, + DateTimeHelper.TWELVE_HOURS, + DateTimeHelper.TWO_DAYS, + DateTimeHelper.TEN_DAYS }; private String formatHistoryString(String fingerprint, SortedMap<long[], double[]> history) { @@ -184,7 +184,8 @@ public class WeightsDocumentWriter implements FingerprintListener, sb.append("\"" + graphName + "\":{" + "\"first\":\"" + DateTimeHelper.format(firstDataPointMillis) + "\",\"last\":\"" + DateTimeHelper.format(lastDataPointMillis) - + "\",\"interval\":" + String.valueOf(dataPointInterval / 1000L) + + "\",\"interval\":" + String.valueOf(dataPointInterval + / DateTimeHelper.ONE_SECOND) + ",\"factor\":" + String.format(Locale.US, "%.9f", factor) + ",\"count\":" + String.valueOf(count) + ",\"values\":["); int dataPointsWritten = 0, previousNonNullIndex = -2; diff --git a/src/org/torproject/onionoo/WeightsStatusUpdater.java b/src/org/torproject/onionoo/WeightsStatusUpdater.java index 3438325..fce1c3e 100644 --- a/src/org/torproject/onionoo/WeightsStatusUpdater.java +++ b/src/org/torproject/onionoo/WeightsStatusUpdater.java @@ -285,16 +285,19 @@ public class WeightsStatusUpdater implements DescriptorListener, long startMillis = e.getKey()[0], endMillis = e.getKey()[1]; double[] weights = e.getValue(); long intervalLengthMillis; - if (this.now - endMillis <= 7L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 60L * 60L * 1000L; - } else if (this.now - endMillis <= 31L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 4L * 60L * 60L * 1000L; - } else if (this.now - endMillis <= 92L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 12L * 60L * 60L * 1000L; - } else if (this.now - endMillis <= 366L * 24L * 60L * 60L * 1000L) { - intervalLengthMillis = 2L * 24L * 60L * 60L * 1000L; + if (this.now - endMillis <= DateTimeHelper.ONE_WEEK) { + intervalLengthMillis = DateTimeHelper.ONE_HOUR; + } else if (this.now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_MONTH) { + intervalLengthMillis = DateTimeHelper.FOUR_HOURS; + } else if (this.now - endMillis <= + DateTimeHelper.ROUGHLY_THREE_MONTHS) { + intervalLengthMillis = DateTimeHelper.TWELVE_HOURS; + } else if (this.now - endMillis <= + DateTimeHelper.ROUGHLY_ONE_YEAR) { + intervalLengthMillis = DateTimeHelper.TWO_DAYS; } else { - intervalLengthMillis = 10L * 24L * 60L * 60L * 1000L; + intervalLengthMillis = DateTimeHelper.TEN_DAYS; } String monthString = DateTimeHelper.format(startMillis, DateTimeHelper.ISO_YEARMONTH_FORMAT); @@ -303,11 +306,11 @@ public class WeightsStatusUpdater implements DescriptorListener, ((endMillis - 1L) / intervalLengthMillis) && lastMonthString.equals(monthString)) { double lastIntervalInHours = (double) ((lastEndMillis - - lastStartMillis) / 60L * 60L * 1000L); + - lastStartMillis) / DateTimeHelper.ONE_HOUR); double currentIntervalInHours = (double) ((endMillis - - startMillis) / 60L * 60L * 1000L); + - startMillis) / DateTimeHelper.ONE_HOUR); double newIntervalInHours = (double) ((endMillis - - lastStartMillis) / 60L * 60L * 1000L); + - lastStartMillis) / DateTimeHelper.ONE_HOUR); for (int i = 0; i < lastWeights.length; i++) { lastWeights[i] *= lastIntervalInHours; lastWeights[i] += weights[i] * currentIntervalInHours;

1 0

[tor-browser-bundle/master] Bug 11478: Add missing PyYAML.
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit c088c17ba7ba93f3fcbcfc75e0c081aed2d98976 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 14 15:08:31 2014 +0000 Bug 11478: Add missing PyYAML. Enhanced asn's patch to fix broken obfsproxy > 0.2.4. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 8 ++++++++ gitian/descriptors/mac/gitian-pluggable-transports.yml | 8 ++++++++ gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ gitian/fetch-inputs.sh | 11 ++++++++++- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ gitian/versions.beta | 4 ++++ gitian/versions.nightly | 4 ++++ 8 files changed, 49 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index fbea855..4423b50 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -30,6 +30,7 @@ files: - "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" +- "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -91,6 +92,13 @@ script: | cp -a build/zope $PTDIR/ cd .. # + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + $PYTHON setup.py build --build-lib build + cp -a build/yaml $PTDIR/ + cd .. + # tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index f6c2e61..f98a20a 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -30,6 +30,7 @@ files: - "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" +- "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -103,6 +104,13 @@ script: | cp -a build/argparse.py $PTDIR/ cd .. # + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + $PYTHON setup.py build --build-lib build + cp -a build/yaml $PTDIR/ + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index d2a3005..3624d04 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -32,6 +32,7 @@ files: - "setuptools.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" +- "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -163,6 +164,12 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 0bc217e..e80713b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -5,6 +5,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ +MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ set -e set -u umask 0022 @@ -167,6 +168,13 @@ do get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" done +for i in PYYAML +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_ASN}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" +done + for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS do URL="${i}_URL" @@ -217,7 +225,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -260,6 +268,7 @@ ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz +ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz diff --git a/gitian/versions b/gitian/versions index 673cf32..d381fed 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,6 +30,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -51,6 +52,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -68,6 +70,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -87,6 +90,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f53fbd8..59edba7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -31,6 +31,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index adb9818..9b3f80d 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -31,6 +31,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 911898d..c54df5a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -31,6 +31,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 14 Apr '14

14 Apr '14

commit 437c6277a803b6d688f8cc89ae95bf3e3da97c5a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 14 10:15:40 2014 +0000 Update translations for tor-launcher-network-settings_completed --- it/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 28ea856..7922fe9 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Impostazioni della rete Tor"> +<!ENTITY torsettings.dialog.title "Impostazioni rete Tor">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Apr '14

14 Apr '14

commit 14a0ea5bfd63b1e39a7881e25abd29d8fe3a36fa Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 14 10:15:37 2014 +0000 Update translations for tor-launcher-network-settings --- it/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/network-settings.dtd b/it/network-settings.dtd index 28ea856..7922fe9 100644 --- a/it/network-settings.dtd +++ b/it/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Impostazioni della rete Tor"> +<!ENTITY torsettings.dialog.title "Impostazioni rete Tor">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 14 Apr '14

14 Apr '14

commit ce31a6299e963f185e7c7bd351670e326a94740f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 14 10:15:30 2014 +0000 Update translations for tor-launcher-properties --- it/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torlauncher.properties b/it/torlauncher.properties index 9fc125d..53f6cb0 100644 --- a/it/torlauncher.properties +++ b/it/torlauncher.properties @@ -24,7 +24,7 @@ torlauncher.ensure_tor_is_running=Per favore assicurati che Tor sia in esecuzion torlauncher.error_proxy_addr_missing=Affinché Tor sia configurato all'utilizzo di un proxy per l'accesso ad Internet, devi specificare sia un indirizzo IP o nome Host, sia un numero di porta. torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy. torlauncher.error_bridges_missing=Devi specificare uno o più ponti. -torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo ti trasporto per il bridge selezionato. +torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo di trasporto per il bridge selezionato. torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. torlauncher.recommended_bridge=(raccomandato)

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 14 Apr '14

14 Apr '14

commit 357c6e2e6cd48e043da1e17ea11b7b2bc68be700 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 14 07:45:23 2014 +0000 Update translations for tails-greeter --- ro/ro.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index f2bc77c..c8599bb 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# icet208 <icet208(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-03-17 13:54+0100\n" +"PO-Revision-Date: 2014-04-14 07:40+0000\n" +"Last-Translator: icet208 <icet208(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +60,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:11 msgid "More options?" -msgstr "" +msgstr "Mai multe optiuni?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 14 Apr '14

14 Apr '14

commit 2cfda12bff3075ba33e204a43547759cfaef2829 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 14 07:45:17 2014 +0000 Update translations for liveusb-creator --- ro/ro.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ro/ro.po b/ro/ro.po index 1bf4898..ee13e9c 100644 --- a/ro/ro.po +++ b/ro/ro.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# icet208 <icet208(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-03-17 22:01+0100\n" +"PO-Revision-Date: 2014-04-14 07:40+0000\n" +"Last-Translator: icet208 <icet208(a)yahoo.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -204,7 +205,7 @@ msgstr "" #: ../liveusb/gui.py:630 msgid "Installation complete!" -msgstr "" +msgstr "Instalare completa!" #: ../liveusb/gui.py:279 #, python-format

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014