May 2012 - tor-commits - lists.torproject.org

[tor/master] Bump _WIN32_WINNT to 0x0501 throughout the code
by nickm＠torproject.org 16 May '12

16 May '12

commit 21e32619146db4602bc35acd0f237a91b43fd754 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:46:37 2012 -0400 Bump _WIN32_WINNT to 0x0501 throughout the code This tells the windows headers to give us definitions that didn't exist before XP -- like the ones that we need for IPv6 support. See bug #5861. We didn't run into this issue with mingw, since mingw doesn't respect _WIN32_WINNT as well as it should for some of its definitions. --- changes/bug5861 | 4 ++++ configure.in | 4 ++-- src/common/aes.c | 2 +- src/common/compat.h | 2 +- src/common/crypto.c | 2 +- src/common/tortls.c | 2 +- src/or/or.h | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug5861 b/changes/bug5861 new file mode 100644 index 0000000..74a1dfb --- /dev/null +++ b/changes/bug5861 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Set _WIN32_WINNT to 0x0501 consistently throughout the code, so + that IPv6 stuff will compile on MSVC, and compilation issues + will be easier to track down. Fix for bug 5861. diff --git a/configure.in b/configure.in index 92b7acb..43c9bb2 100644 --- a/configure.in +++ b/configure.in @@ -796,7 +796,7 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #include <sys/socket.h> #endif #ifdef _WIN32 -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> @@ -820,7 +820,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <sys/socket.h> #endif #ifdef _WIN32 -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> diff --git a/src/common/aes.c b/src/common/aes.c index 692f1bc..1cb6b86 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -13,7 +13,7 @@ #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/compat.h b/src/common/compat.h index f17aa05..b0ef63b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -10,7 +10,7 @@ #include "torint.h" #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/crypto.c b/src/common/crypto.c index 8b1c9a6..f82598f 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -14,7 +14,7 @@ #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/src/common/tortls.c b/src/common/tortls.c index 180efa6..1120f3e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -23,7 +23,7 @@ #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/or/or.h b/src/or/or.h index ad0ac6d..76681c9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -24,7 +24,7 @@ #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #endif

1 0

[metrics-web/master] Current relay descriptor files now contain annotations.
by karsten＠torproject.org 16 May '12

16 May '12

commit 3fb4ba292e4095e6f42130ffb39510cd61a7cac8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 16 13:23:49 2012 +0200 Current relay descriptor files now contain annotations. --- web/WEB-INF/formats.jsp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 1dd1d31..1dab18f 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -74,13 +74,13 @@ are recent: <ul> -<li><tt>@type server-descriptor 1.0</tt></li> -<li><tt>@type extra-info 1.0</tt></li> +<li><tt>@type server-descriptor 1.0</tt></li> +<li><tt>@type extra-info 1.0</tt></li> <li><tt>@type directory 1.0</tt></li> <li><tt>@type network-status-2 1.0</tt></li> -<li><tt>@type network-status-consensus-3 -1.0</tt></li> -<li><tt>@type network-status-vote-3 1.0</tt></li> +<li><tt>@type dir-key-certificate-3 1.0</tt></li> +<li><tt>@type network-status-consensus-3 1.0</tt></li> +<li><tt>@type network-status-vote-3 1.0</tt></li> <li><tt>@type bridge-network-status 1.0</tt></li> <li><tt>@type bridge-server-descriptor 1.0</tt></li>

1 0

[metrics-web/master] Tarballs aren't signed for quite a while now.
by karsten＠torproject.org 16 May '12

16 May '12

commit 0011f9870bbc082299cb3798b41b5c7db02a1995 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 16 13:24:57 2012 +0200 Tarballs aren't signed for quite a while now. --- web/WEB-INF/data.jsp | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index 3b3155b..6768169 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -19,9 +19,7 @@ gathered data available to the public. This approach enables privacy researchers to perform their own analyses using real data on the Tor network, and it acts as a safeguard to not gather data - that are too sensitive to publish. All signatures can be - <a href="https://www.torproject.org/docs/verifying-signatures">verified</a> - using Karsten's PGP key (0xF7C11265). The following data are + that are too sensitive to publish. The following data are available (see the <a href="tools.html">Tools</a> section for details on processing the files): <ul>

1 0

[metrics-db/master] Remove binaries.
by karsten＠torproject.org 16 May '12

16 May '12

commit bba639f85240d21987a35718975b61e1e841962e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:45:55 2012 +0200 Remove binaries. Don't tell Sebastian, or he'll do his I-told-you-so dance... --- .gitignore | 3 +++ lib/commons-codec-1.4.jar | Bin 58160 -> 0 bytes lib/commons-compress-1.0.jar | Bin 143847 -> 0 bytes lib/junit-4.8.2.jar | Bin 237344 -> 0 bytes 4 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e119284..8c9553c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# .jar files +lib/*.jar + # Input directories for descriptors to parse archives/ bridges/ diff --git a/lib/commons-codec-1.4.jar b/lib/commons-codec-1.4.jar deleted file mode 100644 index 458d432..0000000 Binary files a/lib/commons-codec-1.4.jar and /dev/null differ diff --git a/lib/commons-compress-1.0.jar b/lib/commons-compress-1.0.jar deleted file mode 100644 index 78d832c..0000000 Binary files a/lib/commons-compress-1.0.jar and /dev/null differ diff --git a/lib/junit-4.8.2.jar b/lib/junit-4.8.2.jar deleted file mode 100644 index 5b4bb84..0000000 Binary files a/lib/junit-4.8.2.jar and /dev/null differ

1 0

[metrics-db/master] Fix Eclipse warnings and update license to 2012.
by karsten＠torproject.org 16 May '12

16 May '12

commit 107d40e9c46b29a3d674ac99bf0715a296062cac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:34:38 2012 +0200 Fix Eclipse warnings and update license to 2012. Eclipse warnings include import * and unused code. --- LICENSE | 2 +- src/org/torproject/ernie/db/ArchiveReader.java | 24 +++++++++-- src/org/torproject/ernie/db/ArchiveWriter.java | 24 +++++++++--- .../ernie/db/BridgeDescriptorParser.java | 19 +++------ .../ernie/db/BridgePoolAssignmentsProcessor.java | 32 +++++++++++---- .../torproject/ernie/db/BridgeSnapshotReader.java | 31 ++++++++++---- .../ernie/db/CachedRelayDescriptorReader.java | 28 ++++++++++--- src/org/torproject/ernie/db/Configuration.java | 21 +++++++--- .../torproject/ernie/db/ExitListDownloader.java | 22 ++++++++--- src/org/torproject/ernie/db/GetTorDownloader.java | 20 +++++++-- src/org/torproject/ernie/db/LockFile.java | 11 ++++- .../torproject/ernie/db/LoggingConfiguration.java | 16 ++++++-- src/org/torproject/ernie/db/Main.java | 8 ++-- .../ernie/db/RelayDescriptorDownloader.java | 41 ++++++++++++++------ .../torproject/ernie/db/RelayDescriptorParser.java | 32 ++++++++------- src/org/torproject/ernie/db/RsyncDataProvider.java | 13 +++++- .../ernie/db/SanitizedBridgesWriter.java | 5 +-- src/org/torproject/ernie/db/TorperfDownloader.java | 18 +++++++-- .../org/torproject/ernie/db/ArchiveReaderTest.java | 11 ++--- .../org/torproject/ernie/db/ArchiveWriterTest.java | 17 +------- .../ernie/db/BridgeSnapshotReaderTest.java | 11 ++--- .../ernie/db/CachedRelayDescriptorReaderTest.java | 13 +++--- .../ernie/db/SanitizedBridgesWriterTest.java | 11 ++--- 23 files changed, 275 insertions(+), 155 deletions(-) diff --git a/LICENSE b/LICENSE index 9d632a3..55fcf4a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010 The Tor Project +Copyright 2010--2012 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/org/torproject/ernie/db/ArchiveReader.java b/src/org/torproject/ernie/db/ArchiveReader.java index edf04c3..06abf6c 100644 --- a/src/org/torproject/ernie/db/ArchiveReader.java +++ b/src/org/torproject/ernie/db/ArchiveReader.java @@ -1,11 +1,25 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.compress.compressors.bzip2.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; /** * Read in all files in a given directory and pass buffered readers of diff --git a/src/org/torproject/ernie/db/ArchiveWriter.java b/src/org/torproject/ernie/db/ArchiveWriter.java index 0cc983a..1d37edc 100644 --- a/src/org/torproject/ernie/db/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/ArchiveWriter.java @@ -1,13 +1,25 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.binary.*; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.impl.DescriptorParseException; diff --git a/src/org/torproject/ernie/db/BridgeDescriptorParser.java b/src/org/torproject/ernie/db/BridgeDescriptorParser.java index 95071a3..0be62f7 100644 --- a/src/org/torproject/ernie/db/BridgeDescriptorParser.java +++ b/src/org/torproject/ernie/db/BridgeDescriptorParser.java @@ -1,12 +1,12 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.digest.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.util.logging.Level; +import java.util.logging.Logger; public class BridgeDescriptorParser { private SanitizedBridgesWriter sbw; @@ -20,7 +20,6 @@ public class BridgeDescriptorParser { try { BufferedReader br = new BufferedReader(new StringReader( new String(allData, "US-ASCII"))); - boolean skip = false; String line = br.readLine(); if (line == null) { return; @@ -32,12 +31,6 @@ public class BridgeDescriptorParser { this.sbw.sanitizeAndStoreNetworkStatus(allData, dateTime); } } - int runningBridges = 0; - while ((line = br.readLine()) != null) { - if (line.startsWith("s ") && line.contains(" Running")) { - runningBridges++; - } - } } else if (line.startsWith("router ")) { if (this.sbw != null) { if (sanitized) { diff --git a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java index d2e64ec..c07b786 100644 --- a/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/ernie/db/BridgePoolAssignmentsProcessor.java @@ -1,14 +1,30 @@ -/* Copyright 2011 The Tor Project +/* Copyright 2011--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.*; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; public class BridgePoolAssignmentsProcessor { diff --git a/src/org/torproject/ernie/db/BridgeSnapshotReader.java b/src/org/torproject/ernie/db/BridgeSnapshotReader.java index 310029a..1683b58 100644 --- a/src/org/torproject/ernie/db/BridgeSnapshotReader.java +++ b/src/org/torproject/ernie/db/BridgeSnapshotReader.java @@ -1,16 +1,29 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashSet; +import java.util.Set; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; - -import org.apache.commons.compress.compressors.gzip.*; -import org.apache.commons.compress.archivers.tar.*; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; /** * Reads the half-hourly snapshots of bridge descriptors from Tonga. diff --git a/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java b/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java index 29390b7..4da3e44 100644 --- a/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java +++ b/src/org/torproject/ernie/db/CachedRelayDescriptorReader.java @@ -1,14 +1,28 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TimeZone; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.apache.commons.codec.binary.*; -import org.apache.commons.codec.digest.*; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /** * Parses all descriptors in local directory cacheddesc/ and sorts them diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java index 71c9cad..6ab9f44 100644 --- a/src/org/torproject/ernie/db/Configuration.java +++ b/src/org/torproject/ernie/db/Configuration.java @@ -1,11 +1,20 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Initialize configuration with hard-coded defaults, overwrite with @@ -21,8 +30,6 @@ public class Configuration { private boolean importDirectoryArchives = false; private String directoryArchivesDirectory = "archives/"; private boolean keepDirectoryArchiveImportHistory = false; - private String relayDescriptorDatabaseJdbc = - "jdbc:postgresql://localhost/tordir?user=ernie&password=password"; private boolean writeSanitizedBridges = false; private boolean replaceIPAddressesWithHashes = false; private long limitBridgeDescriptorMappings = -1L; diff --git a/src/org/torproject/ernie/db/ExitListDownloader.java b/src/org/torproject/ernie/db/ExitListDownloader.java index 888aa65..82bde11 100644 --- a/src/org/torproject/ernie/db/ExitListDownloader.java +++ b/src/org/torproject/ernie/db/ExitListDownloader.java @@ -1,12 +1,22 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; public class ExitListDownloader { public ExitListDownloader() { diff --git a/src/org/torproject/ernie/db/GetTorDownloader.java b/src/org/torproject/ernie/db/GetTorDownloader.java index 91e9f5f..dfcdc16 100644 --- a/src/org/torproject/ernie/db/GetTorDownloader.java +++ b/src/org/torproject/ernie/db/GetTorDownloader.java @@ -1,11 +1,21 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.logging.Level; +import java.util.logging.Logger; public class GetTorDownloader { diff --git a/src/org/torproject/ernie/db/LockFile.java b/src/org/torproject/ernie/db/LockFile.java index c5e75b0..3255620 100644 --- a/src/org/torproject/ernie/db/LockFile.java +++ b/src/org/torproject/ernie/db/LockFile.java @@ -1,9 +1,14 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.logging.Logger; public class LockFile { diff --git a/src/org/torproject/ernie/db/LoggingConfiguration.java b/src/org/torproject/ernie/db/LoggingConfiguration.java index 1112748..644a462 100644 --- a/src/org/torproject/ernie/db/LoggingConfiguration.java +++ b/src/org/torproject/ernie/db/LoggingConfiguration.java @@ -1,12 +1,20 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.FileHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; /** * Initialize logging configuration. * diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java index a5b5080..e44eac0 100644 --- a/src/org/torproject/ernie/db/Main.java +++ b/src/org/torproject/ernie/db/Main.java @@ -1,10 +1,10 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.File; +import java.util.List; +import java.util.logging.Logger; /** * Coordinate downloading and parsing of descriptors and extraction of diff --git a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java index 4b5d729..f7e9468 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java +++ b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java @@ -1,16 +1,35 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.zip.*; - -import org.apache.commons.codec.digest.*; -import org.apache.commons.codec.binary.*; +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.zip.InflaterInputStream; /** * Downloads relay descriptors from the directory authorities via HTTP. @@ -677,8 +696,6 @@ public class RelayDescriptorDownloader { end += endToken.length(); byte[] descBytes = new byte[end - start]; System.arraycopy(allData, start, descBytes, 0, end - start); - String digest = Hex.encodeHexString(DigestUtils.sha( - descBytes)); this.rdp.parse(descBytes); receivedDescriptors++; } diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java index 3fdd3d8..f3e90f2 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorParser.java +++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java @@ -1,13 +1,21 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import org.apache.commons.codec.digest.*; -import org.apache.commons.codec.binary.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.codec.digest.DigestUtils; /** * Parses relay descriptors including network status consensuses and @@ -168,13 +176,8 @@ public class RelayDescriptorParser { } } } else if (line.startsWith("router ")) { - String publishedLine = null, publishedTime = null, - extraInfoDigest = null, relayIdentifier = null; - String[] parts = line.split(" "); - String nickname = parts[1]; - String address = parts[2]; - int orPort = Integer.parseInt(parts[3]); - int dirPort = Integer.parseInt(parts[4]); + String publishedTime = null, extraInfoDigest = null, + relayIdentifier = null; long published = -1L; while ((line = br.readLine()) != null) { if (line.startsWith("published ")) { @@ -213,7 +216,6 @@ public class RelayDescriptorParser { } else if (line.startsWith("extra-info ")) { String publishedTime = null, relayIdentifier = line.split(" ")[2]; long published = -1L; - boolean skip = false; while ((line = br.readLine()) != null) { if (line.startsWith("published ")) { publishedTime = line.substring("published ".length()); diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 6c0feae..19cf9a4 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -2,9 +2,16 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.Stack; +import java.util.logging.Logger; /** * Copy files published in the last 3 days to a local directory that can diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 7710b82..ff53cf0 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2010 The Tor Project +/* Copyright 2010--2012 The Tor Project * See LICENSE for licensing information */ package org.torproject.ernie.db; @@ -164,8 +164,6 @@ public class SanitizedBridgesWriter { */ private File sanitizedBridgesDirectory; - private File statsDirectory; - private boolean replaceIPAddressesWithHashes; private boolean persistenceProblemWithSecrets; @@ -194,7 +192,6 @@ public class SanitizedBridgesWriter { /* Memorize argument values. */ this.sanitizedBridgesDirectory = sanitizedBridgesDirectory; - this.statsDirectory = statsDirectory; this.replaceIPAddressesWithHashes = replaceIPAddressesWithHashes; /* Initialize logger. */ diff --git a/src/org/torproject/ernie/db/TorperfDownloader.java b/src/org/torproject/ernie/db/TorperfDownloader.java index 48a6ef8..8ee0fe9 100644 --- a/src/org/torproject/ernie/db/TorperfDownloader.java +++ b/src/org/torproject/ernie/db/TorperfDownloader.java @@ -2,10 +2,20 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.logging.Level; +import java.util.logging.Logger; /* Download possibly truncated Torperf .data and .extradata files from * configured sources and append them to the files we already have. */ diff --git a/test/org/torproject/ernie/db/ArchiveReaderTest.java b/test/org/torproject/ernie/db/ArchiveReaderTest.java index 5779865..cb3dea7 100644 --- a/test/org/torproject/ernie/db/ArchiveReaderTest.java +++ b/test/org/torproject/ernie/db/ArchiveReaderTest.java @@ -2,13 +2,12 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class ArchiveReaderTest { diff --git a/test/org/torproject/ernie/db/ArchiveWriterTest.java b/test/org/torproject/ernie/db/ArchiveWriterTest.java index 3ae9abc..2a18e74 100644 --- a/test/org/torproject/ernie/db/ArchiveWriterTest.java +++ b/test/org/torproject/ernie/db/ArchiveWriterTest.java @@ -2,26 +2,15 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; - -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class ArchiveWriterTest { - private File tempArchivesDirectory; - @Rule public TemporaryFolder folder = new TemporaryFolder(); - @Before - public void createTempDirectories() { - this.tempArchivesDirectory = folder.newFolder("archives"); - } - @Test(expected = IllegalArgumentException.class) public void testArchivesDirectoryNull() { new ArchiveWriter(null); diff --git a/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java b/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java index 622462c..f1ad03b 100644 --- a/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java +++ b/test/org/torproject/ernie/db/BridgeSnapshotReaderTest.java @@ -2,13 +2,12 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class BridgeSnapshotReaderTest { diff --git a/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java b/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java index b856fb0..f101249 100644 --- a/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java +++ b/test/org/torproject/ernie/db/CachedRelayDescriptorReaderTest.java @@ -2,14 +2,13 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; +import java.util.ArrayList; -import java.io.*; -import java.util.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class CachedRelayDescriptorReaderTest { diff --git a/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java b/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java index dd05870..f8b4cdd 100644 --- a/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java +++ b/test/org/torproject/ernie/db/SanitizedBridgesWriterTest.java @@ -2,13 +2,12 @@ * See LICENSE for licensing information */ package org.torproject.ernie.db; -import org.torproject.ernie.db.*; +import java.io.File; -import java.io.*; - -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; public class SanitizedBridgesWriterTest {

1 0

[metrics-db/master] Add @type annotations to relay descriptors.
by karsten＠torproject.org 16 May '12

16 May '12

commit 442489f142fc60a783a524e7480d229a836214a0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:24:18 2012 +0200 Add @type annotations to relay descriptors. --- src/org/torproject/ernie/db/ArchiveWriter.java | 26 ++++++++++++++++++----- 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/ernie/db/ArchiveWriter.java b/src/org/torproject/ernie/db/ArchiveWriter.java index 9d9e4de..0cc983a 100644 --- a/src/org/torproject/ernie/db/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/ArchiveWriter.java @@ -31,7 +31,8 @@ public class ArchiveWriter { DescriptorSourceFactory.createDescriptorParser(); } - private boolean store(byte[] data, String filename) { + private boolean store(byte[] typeAnnotation, byte[] data, + String filename) { try { File file = new File(filename); if (!file.exists()) { @@ -45,6 +46,9 @@ public class ArchiveWriter { file.getParentFile().mkdirs(); BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(file)); + if (data.length > 0 && data[0] != '@') { + bos.write(typeAnnotation, 0, typeAnnotation.length); + } bos.write(data, 0, data.length); bos.close(); return true; @@ -59,17 +63,21 @@ public class ArchiveWriter { return false; } + private static final byte[] CONSENSUS_ANNOTATION = + "@type network-status-consensus-3 1.0\n".getBytes(); public void storeConsensus(byte[] data, long validAfter) { SimpleDateFormat printFormat = new SimpleDateFormat( "yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String filename = outputDirectory + "/consensus/" + printFormat.format(new Date(validAfter)) + "-consensus"; - if (this.store(data, filename)) { + if (this.store(CONSENSUS_ANNOTATION, data, filename)) { this.storedConsensuses++; } } + private static final byte[] VOTE_ANNOTATION = + "@type network-status-vote-3 1.0\n".getBytes(); public void storeVote(byte[] data, long validAfter, String fingerprint, String digest) { SimpleDateFormat printFormat = new SimpleDateFormat( @@ -78,11 +86,13 @@ public class ArchiveWriter { String filename = outputDirectory + "/vote/" + printFormat.format(new Date(validAfter)) + "-vote-" + fingerprint + "-" + digest; - if (this.store(data, filename)) { + if (this.store(VOTE_ANNOTATION, data, filename)) { this.storedVotes++; } } + private static final byte[] CERTIFICATE_ANNOTATION = + "@type dir-key-certificate-3 1.0\n".getBytes(); public void storeCertificate(byte[] data, String fingerprint, long published) { SimpleDateFormat printFormat = new SimpleDateFormat( @@ -90,11 +100,13 @@ public class ArchiveWriter { printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String filename = outputDirectory + "/certs/" + fingerprint + "-" + printFormat.format(new Date(published)); - if (this.store(data, filename)) { + if (this.store(CERTIFICATE_ANNOTATION, data, filename)) { this.storedCerts++; } } + private static final byte[] SERVER_DESCRIPTOR_ANNOTATION = + "@type server-descriptor 1.0\n".getBytes(); public void storeServerDescriptor(byte[] data, String digest, long published) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy/MM/"); @@ -103,11 +115,13 @@ public class ArchiveWriter { + printFormat.format(new Date(published)) + digest.substring(0, 1) + "/" + digest.substring(1, 2) + "/" + digest; - if (this.store(data, filename)) { + if (this.store(SERVER_DESCRIPTOR_ANNOTATION, data, filename)) { this.storedServerDescriptors++; } } + private static final byte[] EXTRA_INFO_ANNOTATION = + "@type extra-info 1.0\n".getBytes(); public void storeExtraInfoDescriptor(byte[] data, String extraInfoDigest, long published) { SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); @@ -117,7 +131,7 @@ public class ArchiveWriter { + extraInfoDigest.substring(0, 1) + "/" + extraInfoDigest.substring(1, 2) + "/" + extraInfoDigest; - if (this.store(data, filename)) { + if (this.store(EXTRA_INFO_ANNOTATION, data, filename)) { this.storedExtraInfoDescriptors++; } }

1 0

[metrics-db/master] Handle @type annotations when reading descriptors.
by karsten＠torproject.org 16 May '12

16 May '12

commit 65c525c2ac7f2f4a751615a3cab901b52ce99b6f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 16:17:09 2012 +0200 Handle @type annotations when reading descriptors. --- .../torproject/ernie/db/RelayDescriptorParser.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java index f3e90f2..be54656 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorParser.java +++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java @@ -69,7 +69,10 @@ public class RelayDescriptorParser { * anyway. */ BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); - String line = br.readLine(); + String line; + do { + line = br.readLine(); + } while (line != null && line.startsWith("@")); if (line == null) { this.logger.fine("We were given an empty descriptor for " + "parsing. Ignoring."); @@ -227,6 +230,15 @@ public class RelayDescriptorParser { String sigToken = "\nrouter-signature\n"; String digest = null; int start = ascii.indexOf(startToken); + if (start > 0) { + /* Do not confuse "extra-info " in "@type extra-info 1.0" with + * "extra-info 0000...". TODO This is a hack that should be + * solved by using metrics-lib some day. */ + start = ascii.indexOf("\n" + startToken); + if (start > 0) { + start++; + } + } int sig = ascii.indexOf(sigToken) + sigToken.length(); if (start >= 0 || sig >= 0 || sig > start) { byte[] forDigest = new byte[sig - start];

1 0

[metrics-db/master] Remove PostgreSQL dependency.
by karsten＠torproject.org 16 May '12

16 May '12

commit c7cc99d5bc4d979192d948b07f9ff4a2c8d3ac6e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:38:35 2012 +0200 Remove PostgreSQL dependency. --- LICENSE | 31 ------------------------------- build.xml | 1 - lib/postgresql-8.4-701.jdbc4.jar | Bin 510170 -> 0 bytes 3 files changed, 0 insertions(+), 32 deletions(-) diff --git a/LICENSE b/LICENSE index 55fcf4a..19d7eca 100644 --- a/LICENSE +++ b/LICENSE @@ -235,34 +235,3 @@ under this license: See the License for the specific language governing permissions and limitations under the License. --------------------------------------------------------------------------- - -The PostgreSQL JDBC Interface binary is distributed under this license: - -Copyright (c) 1997-2008, PostgreSQL Global Development Group -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the PostgreSQL Global Development Group nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - diff --git a/build.xml b/build.xml index f7cadef..07d1488 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,6 @@ <pathelement path="${classes}"/> <pathelement location="lib/commons-codec-1.4.jar"/> <pathelement location="lib/commons-compress-1.0.jar"/> - <pathelement location="lib/postgresql-8.4-701.jdbc4.jar"/> <pathelement location="lib/junit-4.8.2.jar"/> <pathelement location="lib/descriptor.jar"/> </path> diff --git a/lib/postgresql-8.4-701.jdbc4.jar b/lib/postgresql-8.4-701.jdbc4.jar deleted file mode 100644 index e21beec..0000000 Binary files a/lib/postgresql-8.4-701.jdbc4.jar and /dev/null differ

1 0

[metrics-db/master] ernie-howto.html is long gone.
by karsten＠torproject.org 16 May '12

16 May '12

commit bdfb9ef79c95ee268af27334dbb8bc83a0665e95 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 15:39:28 2012 +0200 ernie-howto.html is long gone. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 93315ee..97a7a7b 100644 --- a/README +++ b/README @@ -3,5 +3,5 @@ ERNIE is the Enhanced R-based tor Network Intelligence Engine -------------------------------------------------------------------------- -Please find documentation on ERNIE in website/ernie-howto.html and doc/ . +Please find documentation in doc/ .

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 May '12

16 May '12

commit 7e3aeb750e38729d888dc98f4508f5ccbfbb427c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 09:45:06 2012 +0000 Update translations for gettor --- he/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/he/gettor.po b/he/gettor.po index e88dfbb..261958b 100644 --- a/he/gettor.po +++ b/he/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-05-16 09:13+0000\n" +"PO-Revision-Date: 2012-05-16 09:17+0000\n" "Last-Translator: Elifelet <arab.with.nargila(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "" msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "" +msgstr "שליחת הטקסט הזה לטור יגרום לך לקבל במייל את חבילת הדפדפן של טור במספר קבצים של 1.4 מגה בייט." #: lib/gettor/i18n.py:105 msgid "" @@ -366,7 +366,7 @@ msgstr "" msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "" +msgstr "שים לב שהקובץ הזו דיי גדול ולכן אתה זקוק לספק כתובת מייל שמאפשר לך לקבל קבצים בגדלים של 30 מגה בייט בערך." #: lib/gettor/i18n.py:232 msgid ""

1 0