- tor-commits - lists.torproject.org

[tor/master] bug1666 - Pass-through support for SOCKS5 authentication(3)
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 8a2f7ef66ac3bee0d6885ec3ca16937fed0703bb Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Oct 17 14:22:24 2010 +0100 bug1666 - Pass-through support for SOCKS5 authentication(3) Add changes file. --- changes/bug1666 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug1666 b/changes/bug1666 new file mode 100644 index 0000000..9fd790d --- /dev/null +++ b/changes/bug1666 @@ -0,0 +1,4 @@ + o Minor features: + - Accept attempts to include a password authenticator in the handshake, as + supported by SOCKS5. This handles SOCKS clients that don't know how to + omit the password when authenticating. Resolves bug 1666.

1 0

[tor/master] bug1666 - Pass-through support for SOCKS5 authentication(4)
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 02c2d9a4aa2a7ce339e87be9c0c0dc23a6881c14 Author: Robert Hogan <robert(a)roberthogan.net> Date: Tue Dec 14 19:59:42 2010 +0000 bug1666 - Pass-through support for SOCKS5 authentication(4) Implement nickm's suggestion that we tolerate SOCKS5 clients that send authentication credentials and SOCKS commands all in one go. --- src/or/buffers.c | 5 ----- src/test/test.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 5cd76fa..445376f 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1658,11 +1658,6 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, *want_length_out = 2u+usernamelen; return 0; } - if (datalen > 2u + usernamelen + 1u + passlen) { - log_warn(LD_APP, - "socks5: Malformed username/password. Rejecting."); - return -1; - } req->replylen = 2; /* 2 bytes of response */ req->reply[0] = 5; req->reply[1] = 0; /* authentication successful */ diff --git a/src/test/test.c b/src/test/test.c index 8155c3f..bac73f2 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -398,6 +398,46 @@ done: ; } +/** Helper: Perform SOCKS 5 authentication and send data all in one go */ +static void +test_buffers_socks5_authenticate_with_data_helper(const char *cp, buf_t *buf, + socks_request_t *socks) +{ + /* SOCKS 5 Negotiate username/password authentication */ + cp = "\x05\x01\x02"; + write_to_buf(cp, 3, buf); + test_assert(!fetch_from_buf_socks(buf, socks, + get_options()->TestSocks, + get_options()->SafeSocks)); + test_eq(2, socks->replylen); + test_eq(5, socks->reply[0]); + test_eq(SOCKS_USER_PASS, socks->reply[1]); + test_eq(5, socks->socks_version); + + /* SOCKS 5 Send username/password */ + /* SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369 */ + cp = "\x01\x02me\x02me\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"; + write_to_buf(cp, 17, buf); + test_assert(!fetch_from_buf_socks(buf, socks, + get_options()->TestSocks, + get_options()->SafeSocks)); + test_eq(5, socks->socks_version); + test_eq(2, socks->replylen); + test_eq(5, socks->reply[0]); + test_eq(0, socks->reply[1]); + + test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks) == 1); + test_eq(5, socks->socks_version); + test_eq(2, socks->replylen); + test_eq(5, socks->reply[0]); + test_eq(0, socks->reply[1]); + test_streq("2.2.2.2", socks->address); + test_eq(4369, socks->port); +done: + ; +} + /** Helper: Perform SOCKS 5 authentication before method negotiated */ static void test_buffers_socks5_auth_before_negotiation_helper(const char *cp, buf_t *buf, @@ -610,6 +650,15 @@ test_buffers(void) buf = buf_new_with_capacity(256); socks = tor_malloc_zero(sizeof(socks_request_t));; + /* A SOCKS 5 client that sends credentials and data in one go */ + test_buffers_socks5_authenticate_with_data_helper(cp, buf, socks); + + tor_free(socks); + buf_free(buf); + buf = NULL; + buf = buf_new_with_capacity(256); + socks = tor_malloc_zero(sizeof(socks_request_t));; + /* A SOCKS 5 client that doesn't want authentication */ test_buffers_socks5_no_authenticate_helper(cp, buf, socks); test_buffers_socks5_supported_commands_helper(cp, buf, socks);

1 0

[tor/master] Correct byte-counting in socks auth parsing code
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 1ed615ded7db0765e8355687bda8b00fdc643e3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 11:45:15 2011 -0400 Correct byte-counting in socks auth parsing code --- src/or/buffers.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 445376f..4b8532a 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1648,14 +1648,19 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, "authentication negotiated. Rejecting."); return -1; } + /* Format is: authversion [1 byte] == 1 + usernamelen [1 byte] + username [usernamelen bytes] + passlen [1 byte] + password [passlen bytes] */ usernamelen = (unsigned char)*(data + 1); - if (datalen < 2u + usernamelen) { - *want_length_out = 2u+usernamelen; + if (datalen < 2u + usernamelen + 1u) { + *want_length_out = 2u + usernamelen + 1u; return 0; } passlen = (unsigned char)*(data + 2u + usernamelen); if (datalen < 2u + usernamelen + 1u + passlen) { - *want_length_out = 2u+usernamelen; + *want_length_out = 2u + usernamelen + 1u + passlen; return 0; } req->replylen = 2; /* 2 bytes of response */

1 0

[tor/master] Fix 'make check-spaces'
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 9b3f48c0744bd72cb8b25ac7857476181b29481a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 11:47:35 2011 -0400 Fix 'make check-spaces' --- src/or/buffers.c | 2 +- src/test/test.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 4b8532a..3490d6d 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1691,7 +1691,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, req->socks_version = 5; /* remember we've already negotiated auth */ log_debug(LD_APP,"socks5: accepted method 0 (no authentication)"); r=0; - }else if (memchr(data+2, SOCKS_USER_PASS,nummethods)) { + } else if (memchr(data+2, SOCKS_USER_PASS,nummethods)) { req->reply[1] = SOCKS_USER_PASS; /* tell client to use "user/pass" auth method */ req->socks_version = 5; /* remember we've already negotiated auth */ diff --git a/src/test/test.c b/src/test/test.c index bac73f2..d0e24d1 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -210,7 +210,7 @@ test_buffers_socks4_unsupported_commands_helper(const char *cp, buf_t *buf, test_eq(4, socks->socks_version); test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */ -done: + done: ; } @@ -248,7 +248,7 @@ test_buffers_socks4_supported_commands_helper(const char *cp, buf_t *buf, test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */ test_streq("tor.org", socks->address); -done: + done: ; } @@ -279,7 +279,7 @@ test_buffers_socks5_unsupported_commands_helper(const char *cp, buf_t *buf, test_eq(0, socks->reply[1]); /* XXX: shouldn't tor reply 'command not supported' [07]? */ -done: + done: ; } @@ -334,7 +334,7 @@ test_buffers_socks5_supported_commands_helper(const char *cp, buf_t *buf, test_eq(0, socks->reply[1]); test_streq("2.2.2.2", socks->address); -done: + done: ; } @@ -364,7 +364,7 @@ test_buffers_socks5_no_authenticate_helper(const char *cp, buf_t *buf, test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); -done: + done: ; } @@ -394,7 +394,7 @@ test_buffers_socks5_authenticate_helper(const char *cp, buf_t *buf, test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); -done: + done: ; } @@ -434,7 +434,7 @@ test_buffers_socks5_authenticate_with_data_helper(const char *cp, buf_t *buf, test_eq(0, socks->reply[1]); test_streq("2.2.2.2", socks->address); test_eq(4369, socks->port); -done: + done: ; } @@ -454,7 +454,7 @@ test_buffers_socks5_auth_before_negotiation_helper(const char *cp, buf_t *buf, test_eq(0, socks->reply[0]); test_eq(0, socks->reply[1]); -done: + done: ; }

1 0

[tor/master] Be more strict about when to accept socks auth message
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit aec396d9d0c2db18d44c9ad850bedbc01d50e40a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 12:00:00 2011 -0400 Be more strict about when to accept socks auth message In the code as it stood, we would accept any number of socks5 username/password authentication messages, regardless of whether we had actually negotiated username/password authentication. Instead, we should only accept one, and only if we have really negotiated username/password authentication. This patch also makes some fields of socks_request_t into uint8_t, for safety. --- src/or/buffers.c | 36 +++++++++++++++++++++--------------- src/or/or.h | 12 +++++++++--- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 3490d6d..bbd60c4 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1636,18 +1636,12 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, unsigned char usernamelen, passlen; struct in_addr in; - socksver = *data; - - switch (socksver) { /* which version of socks? */ - - case 1: /* socks5: username/password authentication request */ - - if (req->socks_version != 5) { - log_warn(LD_APP, - "socks5: Received authentication attempt before " - "authentication negotiated. Rejecting."); - return -1; - } + if (req->socks_version == 5 && !req->got_auth) { + /* See if we have received authentication. Strictly speaking, we should + also check whether we actually negotiated username/password + authentication. But some broken clients will send us authentication + even if we negotiated SOCKS_NO_AUTH. */ + if (*data == 1) { /* username/pass version 1 */ /* Format is: authversion [1 byte] == 1 usernamelen [1 byte] username [usernamelen bytes] @@ -1669,8 +1663,19 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, log_debug(LD_APP, "socks5: Accepted username/password without checking."); *drain_out = 2u + usernamelen + 1u + passlen; + req->got_auth = 1; return 0; + } else if (req->auth_type == SOCKS_USER_PASS) { + /* unknown version byte */ + log_warn(LD_APP, "Socks5 username/password version %d not recognized; " + "rejecting.", (int)*data); + return -1; + } + } + socksver = *data; + + switch (socksver) { /* which version of socks? */ case 5: /* socks5 */ if (req->socks_version != 5) { /* we need to negotiate a method */ @@ -1691,7 +1696,8 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, req->socks_version = 5; /* remember we've already negotiated auth */ log_debug(LD_APP,"socks5: accepted method 0 (no authentication)"); r=0; - } else if (memchr(data+2, SOCKS_USER_PASS,nummethods)) { + } else if (memchr(data+2, SOCKS_USER_PASS, nummethods)) { + req->auth_type = SOCKS_USER_PASS; req->reply[1] = SOCKS_USER_PASS; /* tell client to use "user/pass" auth method */ req->socks_version = 5; /* remember we've already negotiated auth */ @@ -1911,7 +1917,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, case 'H': /* head */ case 'P': /* put/post */ case 'C': /* connect */ - strlcpy(req->reply, + strlcpy((char*)req->reply, "HTTP/1.0 501 Tor is not an HTTP Proxy\r\n" "Content-Type: text/html; charset=iso-8859-1\r\n\r\n" "<html>\n" @@ -1937,7 +1943,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, "</body>\n" "</html>\n" , MAX_SOCKS_REPLY_LEN); - req->replylen = strlen(req->reply)+1; + req->replylen = strlen((char*)req->reply)+1; /* fall through */ default: /* version is not socks4 or socks5 */ log_warn(LD_APP, diff --git a/src/or/or.h b/src/or/or.h index 6ae62e8..bc80e39 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3088,10 +3088,15 @@ struct socks_request_t { /** Which version of SOCKS did the client use? One of "0, 4, 5" -- where * 0 means that no socks handshake ever took place, and this is just a * stub connection (e.g. see connection_ap_make_link()). */ - char socks_version; - int command; /**< What is this stream's goal? One from the above list. */ + uint8_t socks_version; + /** If using socks5 authentication, which authentication type did we + * negotiate? currently we support 0 (no authentication) and 2 + * (username/password). */ + uint8_t auth_type; + /** What is this stream's goal? One of the SOCKS_COMMAND_* values */ + uint8_t command; size_t replylen; /**< Length of <b>reply</b>. */ - char reply[MAX_SOCKS_REPLY_LEN]; /**< Write an entry into this string if + uint8_t reply[MAX_SOCKS_REPLY_LEN]; /**< Write an entry into this string if * we want to specify our own socks reply, * rather than using the default socks4 or * socks5 socks reply. We use this for the @@ -3103,6 +3108,7 @@ struct socks_request_t { unsigned int has_finished : 1; /**< Has the SOCKS handshake finished? Used to * make sure we send back a socks reply for * every connection. */ + unsigned int got_auth : 1; /**< Have we received any authentication data? */ }; /********************************* circuitbuild.c **********************/

1 0

[tor/master] If we negotiate authentication, require it.
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 204bce7e3ca0f60cfec1d8be700848309f605abd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 12:16:09 2011 -0400 If we negotiate authentication, require it. --- src/or/buffers.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index bbd60c4..7b212a7 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1716,6 +1716,11 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, return r; } + if (req->auth_type != SOCKS_NO_AUTH && !req->got_auth) { + log_warn(LD_APP, + "socks5: negotiated authentication, but none provided"); + return -1; + } /* we know the method; read in the request */ log_debug(LD_APP,"socks5: checking request"); if (datalen < 8) {/* basic info plus >=2 for addr plus 2 for port */

1 0

[torspec/master] Update socks-extensions to allow username/password auth
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit f8529305e94ac36c17da6d9b756a9c83e6b046fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 18:08:37 2011 -0400 Update socks-extensions to allow username/password auth --- socks-extensions.txt | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/socks-extensions.txt b/socks-extensions.txt index 62d86ac..60695e5 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -31,8 +31,11 @@ Tor's extensions to the SOCKS protocol SOCKS5: - The (SOCKS5) "UDP ASSOCIATE" command is not supported. - IPv6 is not supported in CONNECT commands. - - Only the "NO AUTHENTICATION" (SOCKS5) authentication method [00] is - supported. + - The "NO AUTHENTICATION" (SOCKS5) authentication method [00] is supported. + As of Tor 0.2.3.2-alpha, the "USERNAME/PASSWORD" (SOCKS5) authentication + method [02] is supported too. As an extension to support some broken + clients, we allow clients to pass "USERNAME/PASSWORD" authentication to + us even if no authentication was selected. 2. Name lookup

1 0

[torspec/master] Use correct terms from RFC's in spec.
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit adb2bf39305f7e97d4dc58abe91b9ae6939075a1 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Jul 12 09:34:00 2011 -0400 Use correct terms from RFC's in spec. --- socks-extensions.txt | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/socks-extensions.txt b/socks-extensions.txt index 60695e5..f587d9c 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -31,11 +31,12 @@ Tor's extensions to the SOCKS protocol SOCKS5: - The (SOCKS5) "UDP ASSOCIATE" command is not supported. - IPv6 is not supported in CONNECT commands. - - The "NO AUTHENTICATION" (SOCKS5) authentication method [00] is supported. - As of Tor 0.2.3.2-alpha, the "USERNAME/PASSWORD" (SOCKS5) authentication - method [02] is supported too. As an extension to support some broken - clients, we allow clients to pass "USERNAME/PASSWORD" authentication to - us even if no authentication was selected. + - The "NO AUTHENTICATION REQUIRED" (SOCKS5) authentication method [00] is + supported; and as of Tor 0.2.3.2-alpha, the "USERNAME/PASSWORD" (SOCKS5) + authentication method [02] is supported too. Any credentials passed to + the latter are ignored. As an extension to support some broken clients, + we allow clients to pass "USERNAME/PASSWORD" authentication to us even if + no authentication was selected. 2. Name lookup

1 0

[metrics-web/master] Allow importing descriptors from a local Tor directory.
by karsten＠torproject.org 13 Jul '11

13 Jul '11

commit d19126aeab5974db35a7a087ff21984ea6085682 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 13 17:38:56 2011 +0200 Allow importing descriptors from a local Tor directory. The `KeepDirectoryArchiveImportHistory` option allows us to keep a history of imported directory archive files to know which files have been imported before. This history can be useful when importing from a changing source to avoid importing descriptors over and over again, but it can be confusing to users who don't know about it. However, this approach does not work for importing cached descriptors from a local Tor directory, because descriptors are contained in files like cached-descriptors. Filenames never change here, just contents. The new approach is to also keep the file modification time in our history and check whether files have been modified after we last read them. This lets us import descriptors from a local Tor directory, too. Also update the README. --- ChangeLog | 1 + README | 27 ++++++++----------- src/org/torproject/ernie/cron/ArchiveReader.java | 31 ++++++++++++++++----- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 387e813..42032ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Metrics database and website change log: Changes in version 0.0.2 - 2011-??-?? - Let users download votes from a given valid-after time. + - Allow importing descriptors from a local Tor directory. Changes in version 0.0.1 - 2011-06-08 - Initial release diff --git a/README b/README index 0786852..111543a 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ delivery service, and others. 1.1. Preparing the operating system ------------------------------------ +=================================== This README describes the steps for installing metrics-web on a Debian GNU/Linux Squeeze server. Instructions for other operating systems may @@ -151,22 +151,25 @@ can process. Look for the config option WriteRelayDescriptorsRawFiles in /srv/metrics-web/config.template for more information on this experimental feature. +In a future version of metrics-web it may also be possible to update local +relay descriptor tarballs from the official metrics server via rsync and +import only the changes into the metrics database. The idea is to simply +rsync the data/ directory from the metrics server and have all information +available. However, this feature is not implemented yet. + 1.4. Importing relay descriptors from a local Tor data directory ================================================================ -WARNING: The functions described in this section are not implemented yet! - -In a future version of metrics-web, the metrics database importer will be -able to import the cached descriptors from a local Tor data directory. -(A special case of importing descriptors from a continuously updated -directory is when both metrics-db and metrics-web are run on the same -machine, but this shouldn't be the general case.) +In order to keep the data in the metrics database up-to-date, the metrics +database importer can import the cached descriptors from a local Tor data +directory. Configure a local Tor client to fetch all known descriptors as early as possible by adding these config options to its torrc file: FetchUselessDescriptors 1 +FetchDirInfoEarly 1 FetchDirInfoExtraEarly 1 Tell the metrics database importer where to find the cached descriptor @@ -181,14 +184,6 @@ Add a crontab entry for the database importer to run once per hour: 15 * * * * cd /srv/metrics-web/ && ./run.sh -In a future version of metrics-web it may also be possible to update local -relay descriptor tarballs from the official metrics server via rsync and -import only the changes into the metrics database. The idea is to simply -rsync the data/ directory from the metrics server and have all information -available. But until this is implemented, the recommended way to keep the -metrics website up-to-date would be the one described above in this -section. - 1.5. Importing GeoIP information ================================ diff --git a/src/org/torproject/ernie/cron/ArchiveReader.java b/src/org/torproject/ernie/cron/ArchiveReader.java index b21233d..4d4fe64 100644 --- a/src/org/torproject/ernie/cron/ArchiveReader.java +++ b/src/org/torproject/ernie/cron/ArchiveReader.java @@ -21,8 +21,9 @@ public class ArchiveReader { int parsedFiles = 0, ignoredFiles = 0; Logger logger = Logger.getLogger(ArchiveReader.class.getName()); - SortedSet<String> lastArchivesImportHistory = new TreeSet<String>(); - SortedSet<String> newArchivesImportHistory = new TreeSet<String>(); + SortedMap<String, Long> + lastArchivesImportHistory = new TreeMap<String, Long>(), + newArchivesImportHistory = new TreeMap<String, Long>(); File archivesImportHistoryFile = new File(statsDirectory, "archives-import-history"); if (keepImportHistory && archivesImportHistoryFile.exists()) { @@ -31,7 +32,15 @@ public class ArchiveReader { archivesImportHistoryFile)); String line = null; while ((line = br.readLine()) != null) { - lastArchivesImportHistory.add(line); + String[] parts = line.split(","); + if (parts.length < 2) { + logger.warning("Archives import history file does not " + + "contain timestamps. Skipping."); + break; + } + long lastModified = Long.parseLong(parts[0]); + String filename = parts[1]; + lastArchivesImportHistory.put(filename, lastModified); } br.close(); } catch (IOException e) { @@ -53,14 +62,17 @@ public class ArchiveReader { } } else { try { + long lastModified = pop.lastModified(); + String filename = pop.getName(); if (keepImportHistory) { - newArchivesImportHistory.add(pop.getName()); + newArchivesImportHistory.put(filename, lastModified); } if (keepImportHistory && - lastArchivesImportHistory.contains(pop.getName())) { + lastArchivesImportHistory.containsKey(filename) && + lastArchivesImportHistory.get(filename) >= lastModified) { ignoredFiles++; continue; - } else if (pop.getName().endsWith(".tar.bz2")) { + } else if (filename.endsWith(".tar.bz2")) { logger.warning("Cannot parse compressed tarball " + pop.getAbsolutePath() + ". Skipping."); continue; @@ -99,6 +111,7 @@ public class ArchiveReader { break; } } + logger.warning(sb.toString()); } } if (keepImportHistory) { @@ -106,8 +119,10 @@ public class ArchiveReader { archivesImportHistoryFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( archivesImportHistoryFile)); - for (String line : newArchivesImportHistory) { - bw.write(line + "\n"); + for (Map.Entry<String, Long> historyEntry : + newArchivesImportHistory.entrySet()) { + bw.write(String.valueOf(historyEntry.getValue()) + "," + + historyEntry.getKey() + "\n"); } bw.close(); } catch (IOException e) {

1 0

[torbrowser/master] bump all tbb versions to firefox 3.6.19
by erinn＠torproject.org 13 Jul '11

13 Jul '11

commit 715c03a582523dfe89b64e1bd13a7f3859285796 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 13 10:58:08 2011 -0300 bump all tbb versions to firefox 3.6.19 --- README | 9 ++++++--- README.Linux | 6 +++--- README.OSX | 5 ++++- build-scripts/Makefile | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 4 ++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README b/README index 2afd038..c9df4a1 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.18 - \_ Firefox 3.6.18 +FirefoxPortable 3.6.19 + \_ Firefox 3.6.19 \_ Torbutton 1.2.5 \_ HTTPS Everywhere 1.0.0development.4 PidginPortable 2.7.4 @@ -347,7 +347,10 @@ Changelog Update zlib to 1.2.5 Update OpenSSL to 1.0.0d -1.3.25: Released 2011-06-11 +1.3.25: Released 2011-07-11 Update Firefox to 3.6.18 Update Libevent to 2.0.12-stable Update HTTPS-Everywhere to 1.0.0development.4 + +1.3.26: Released 2011-07-13 + Update Firefox to 3.6.19 diff --git a/README.Linux b/README.Linux index 850608c..b5325b1 100644 --- a/README.Linux +++ b/README.Linux @@ -6,7 +6,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) -Firefox 3.6.18 +Firefox 3.6.19 \_ Torbutton 1.2.5 |_ NoScript 2.1.1.2 |_ BetterPrivacy 1.51 @@ -29,9 +29,9 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- -1.1.12: Released 2011-07-11 +1.1.12: Released 2011-07-13 Update Tor to 0.2.2.30-rc - Update Firefox to 3.6.18 + Update Firefox to 3.6.1999999999 Update NoScript to 2.1.1.2 Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/README.OSX b/README.OSX index 3a05c7a..08ca414 100644 --- a/README.OSX +++ b/README.OSX @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.12 (with Qt 4.6.2) Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 -Firefox 3.6.18 +Firefox 3.6.19 \_ Torbutton 1.2.5 |_ NoScript 2.1.1.2 |_ HTTPS-Everywhere 1.0.0development.4 @@ -24,6 +24,9 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.22: Released 2011-07-13 + Update Firefox to 3.6.19 + 1.0.21: Released 2011-07-12 The new HTTPS-Everywhere was missing from the last release. Actually add it this time. diff --git a/build-scripts/Makefile b/build-scripts/Makefile index 97085bb..2d0f6b3 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.18 +FIREFOX_VERSION=3.6.19 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.25 +VERSION=1.3.26 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index cc185be..aa5c919 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.18 +FIREFOX_VER=3.6.19 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 9096537..0269494 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -42,7 +42,7 @@ TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.18 +FIREFOX_VER=3.6.19 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 NOSCRIPT_VER=2.1.1.2 @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.21-dev +VERSION=1.0.22-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0