- tor-commits - lists.torproject.org

[tor/release-0.2.3] fold in 0.2.3.22-rc changes
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit de3cd992406ef47ccd74b25b0efc14a437c1438f Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:26:30 2012 -0400 fold in 0.2.3.22-rc changes --- ChangeLog | 15 +++++++++++++++ changes/bug6801 | 5 ----- changes/bug6811 | 5 ----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e78957..a1165aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Changes in version 0.2.3.22-rc - 2012-09-11 + Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable + assertion. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + + o Minor bugfixes: + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix + on 0.2.2.23-alpha. + + Changes in version 0.2.3.21-rc - 2012-09-05 Tor 0.2.3.21-rc is the fourth release candidate for the Tor 0.2.3.x series. It fixes a trio of potential security bugs, fixes a bug where diff --git a/changes/bug6801 b/changes/bug6801 deleted file mode 100644 index ef21acc..0000000 --- a/changes/bug6801 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid segfault when starting up having run with an extremely old - version of Tor and parsing its state file. Fixes bug 6801; bugfix on - 0.2.2.23-alpha. - diff --git a/changes/bug6811 b/changes/bug6811 deleted file mode 100644 index 841ec1c..0000000 --- a/changes/bug6811 +++ /dev/null @@ -1,5 +0,0 @@ - o Major security fixes: - - Fix an assertion failure in tor_timegm that could be triggered - by a badly formatted directory object. Bug found by fuzzing with - Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. -

1 0

[tor/release-0.2.3] Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 84f47ffc462dface8db1def322414daa43400d1c Merge: 1c30e6a 973c18b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:14:43 2012 -0400 Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2 changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-)

1 0

[tor/release-0.2.3] Merge branch 'maint-0.2.3' into release-0.2.3
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 57f05c318d25c98b0447d19e18c82b1bb6f4248c Merge: 139a81c 5833861 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:18:14 2012 -0400 Merge branch 'maint-0.2.3' into release-0.2.3 changes/bug6801 | 5 +++++ changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/or/rephist.c | 3 ++- src/test/test_util.c | 13 +++++++++++++ 8 files changed, 45 insertions(+), 19 deletions(-)

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 5833861f62d2667eeda1ed0f6595763aa00250b0 Merge: 8731a4e 84f47ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:20:15 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/test/test_util.c changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --cc src/test/test_util.c index 9eca904,12e3fa9..4f9eb73 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -14,10 -13,19 +14,23 @@@ #include "mempool.h" #include "memarea.h" +#ifdef _WIN32 +#include <tchar.h> +#endif + + /* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ + static time_t + tor_timegm_wrapper(const struct tm *tm) + { + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; + } + + #define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {

1 0

[tor/release-0.2.3] Avoid segfault when reading state file from ancient tor
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 8731a4e148e23d8edbb7f32bdfeee30c326f33cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:35:18 2012 -0400 Avoid segfault when reading state file from ancient tor If s_values is null in rep_hist_load_bwhist_state_section, we would call smartlist_len() on it, and die. Fixes bug 6801. --- changes/bug6801 | 5 +++++ src/or/rephist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug6801 b/changes/bug6801 new file mode 100644 index 0000000..ef21acc --- /dev/null +++ b/changes/bug6801 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix on + 0.2.2.23-alpha. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 720d14c..3b0d9dd 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1675,7 +1675,8 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, uint64_t v, mv; int i,ok,ok_m; - int have_maxima = (smartlist_len(s_values) == smartlist_len(s_maxima)); + int have_maxima = s_maxima && s_values && + (smartlist_len(s_values) == smartlist_len(s_maxima)); if (s_values && s_begins >= now - NUM_SECS_BW_SUM_INTERVAL*NUM_TOTALS) { start = s_begins - s_interval*(smartlist_len(s_values));

1 0

[tor/release-0.2.3] Fix assertion failure in tor_timegm.
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 973c18bf0e84d14d8006a9ae97fde7f7fb97e404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 10:41:59 2012 -0400 Fix assertion failure in tor_timegm. Fixes bug 6811. --- changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/changes/bug6811 b/changes/bug6811 new file mode 100644 index 0000000..841ec1c --- /dev/null +++ b/changes/bug6811 @@ -0,0 +1,5 @@ + o Major security fixes: + - Fix an assertion failure in tor_timegm that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + diff --git a/src/common/util.c b/src/common/util.c index a03a576..698f989 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1212,11 +1212,11 @@ n_leapdays(int y1, int y2) static const int days_per_month[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -/** Return a time_t given a struct tm. The result is given in GMT, and - * does not account for leap seconds. +/** Compute a time_t given a struct tm. The result is given in GMT, and + * does not account for leap seconds. Return 0 on success, -1 on failure. */ -time_t -tor_timegm(struct tm *tm) +int +tor_timegm(const struct tm *tm, time_t *time_out) { /* This is a pretty ironclad timegm implementation, snarfed from Python2.2. * It's way more brute-force than fiddling with tzset(). @@ -1224,11 +1224,11 @@ tor_timegm(struct tm *tm) time_t year, days, hours, minutes, seconds; int i; year = tm->tm_year + 1900; - if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11) { + if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11 || + tm->tm_year >= INT32_MAX-1900) { log_warn(LD_BUG, "Out-of-range argument to tor_timegm"); return -1; } - tor_assert(year < INT_MAX); days = 365 * (year-1970) + n_leapdays(1970,(int)year); for (i = 0; i < tm->tm_mon; ++i) days += days_per_month[i]; @@ -1239,7 +1239,8 @@ tor_timegm(struct tm *tm) minutes = hours*60 + tm->tm_min; seconds = minutes*60 + tm->tm_sec; - return seconds; + *time_out = seconds; + return 0; } /* strftime is locale-specific, so we need to replace those parts */ @@ -1299,7 +1300,7 @@ parse_rfc1123_time(const char *buf, time_t *t) return -1; } if (tm_mday < 1 || tm_mday > 31 || tm_hour > 23 || tm_min > 59 || - tm_sec > 60) { + tm_sec > 60 || tm_year >= INT32_MAX || tm_year < 1970) { char *esc = esc_for_log(buf); log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc); tor_free(esc); @@ -1335,8 +1336,7 @@ parse_rfc1123_time(const char *buf, time_t *t) } tm.tm_year -= 1900; - *t = tor_timegm(&tm); - return 0; + return tor_timegm(&tm, t); } /** Set buf to the ISO8601 encoding of the local value of t. @@ -1378,13 +1378,13 @@ parse_iso_time(const char *cp, time_t *t) return -1; } if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 || - hour > 23 || minute > 59 || second > 60) { + hour > 23 || minute > 59 || second > 60 || year >= INT32_MAX) { char *esc = esc_for_log(cp); log_warn(LD_GENERAL, "ISO time %s was nonsensical", esc); tor_free(esc); return -1; } - st_tm.tm_year = year-1900; + st_tm.tm_year = (int)year-1900; st_tm.tm_mon = month-1; st_tm.tm_mday = day; st_tm.tm_hour = hour; @@ -1397,8 +1397,7 @@ parse_iso_time(const char *cp, time_t *t) tor_free(esc); return -1; } - *t = tor_timegm(&st_tm); - return 0; + return tor_timegm(&st_tm, t); } /** Given a date in one of the three formats allowed by HTTP (ugh), diff --git a/src/common/util.h b/src/common/util.h index d477156..75de342 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -232,7 +232,7 @@ int64_t tv_to_msec(const struct timeval *tv); int64_t tv_to_usec(const struct timeval *tv); long tv_udiff(const struct timeval *start, const struct timeval *end); long tv_mdiff(const struct timeval *start, const struct timeval *end); -time_t tor_timegm(struct tm *tm); +int tor_timegm(const struct tm *tm, time_t *time_out); #define RFC1123_TIME_LEN 29 void format_rfc1123_time(char *buf, time_t t); int parse_rfc1123_time(const char *buf, time_t *t); diff --git a/src/or/directory.c b/src/or/directory.c index 29cf10c..975f891 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2493,7 +2493,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, if ((header = http_get_header(headers, "If-Modified-Since: "))) { struct tm tm; if (parse_http_time(header, &tm) == 0) { - if_modified_since = tor_timegm(&tm); + if (tor_timegm(&tm, &if_modified_since)<0) + if_modified_since = 0; } /* The correct behavior on a malformed If-Modified-Since header is to * act as if no If-Modified-Since header had been given. */ diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ab08fd0..a557fc7 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2536,7 +2536,7 @@ time_t dirvote_get_start_of_next_interval(time_t now, int interval) { struct tm tm; - time_t midnight_today; + time_t midnight_today=0; time_t midnight_tomorrow; time_t next; @@ -2545,7 +2545,9 @@ dirvote_get_start_of_next_interval(time_t now, int interval) tm.tm_min = 0; tm.tm_sec = 0; - midnight_today = tor_timegm(&tm); + if (tor_timegm(&tm, &midnight_today) < 0) { + log_warn(LD_BUG, "Ran into an invalid time when trying to find midnight."); + } midnight_tomorrow = midnight_today + (24*60*60); next = midnight_today + ((now-midnight_today)/interval + 1)*interval; diff --git a/src/test/test_util.c b/src/test/test_util.c index f9a83a3..12e3fa9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -13,6 +13,19 @@ #include "mempool.h" #include "memarea.h" +/* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ +static time_t +tor_timegm_wrapper(const struct tm *tm) +{ + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; +} + +#define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {

1 0

[tor/release-0.2.2] bump to 0.2.2.39
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit bec76476efb715498b86282d4969c096df336140 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:11:33 2012 -0400 bump to 0.2.2.39 --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 62cabde..7e9b2e0 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.38) +AM_INIT_AUTOMAKE(tor, 0.2.2.39) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index efd8fcb..2066c0a 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.2.38" +!define VERSION "0.2.2.39" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 58860f5..d069a48 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,5 +233,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.2.38" +#define VERSION "0.2.2.39"

1 0

[torbrowser/maint-2.2] update all stable TBBs to 2.2.39-1 for Tor 0.2.2.39
by erinn＠torproject.org 11 Sep '12

11 Sep '12

commit 3106539e60690a7ec50a6132f328e1dab623e309 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 11 19:11:44 2012 +0100 update all stable TBBs to 2.2.39-1 for Tor 0.2.2.39 --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 7 +++++++ changelog.osx-2.2 | 7 +++++++ changelog.windows-2.2 | 7 +++++++ 10 files changed, 33 insertions(+), 12 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 2ee157d..cd4e9b6 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5.2 + |_ NoScript 2.5.4 |_ HTTPS-Everywhere 2.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index dc6d794..b317861 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5.2 + |_ NoScript 2.5.4 |_ HTTPS-Everywhere 2.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6e8ae48..bf3ee84 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5.2 + |_ NoScript 2.5.4 |_ HTTPS-Everywhere 2.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7e9a20f..137591b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f08b50c..6ceb3e7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a082236..4640acc 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.38 +RELEASE_VER=2.2.39 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,13 +8,13 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.2.38 +TOR_VER=0.2.2.39 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.7esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.5.2 +NOSCRIPT_VER=2.5.4 HTTPSEVERYWHERE_VER=2.2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a871270..0492f84 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c4b6d52..aee61e2 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.39-1); suite=linux + + * Update Tor to 0.2.2.39 + * Update NoScript to 2.5.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:39 BST 2012 + Tor Browser Bundle (2.2.38-2); suite=linux * Update Firefox to 10.0.7esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d3b0776..a778ee7 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.39-1); suite=osx + + * Update Tor to 0.2.2.39 + * Update NoScript to 2.5.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:34 BST 2012 + Tor Browser Bundle (2.2.38-2); suite=osx * Update Firefox to 10.0.7esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index a604b2c..b431172 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.39-1); suite=windows + + * Update Tor to 0.2.2.39 + * Update NoScript to 2.5.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:36 BST 2012 + Tor Browser Bundle (2.2.38-2); suite=windows * Update Firefox to 10.0.7esr

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 Sep '12

11 Sep '12

commit 203a451f17a30303e862759fa972dbd513066ec1 Merge: b079c16 3106539 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 11 19:12:02 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 7 +++++++ changelog.osx-2.2 | 7 +++++++ changelog.windows-2.2 | 7 +++++++ 10 files changed, 33 insertions(+), 12 deletions(-)

1 0

[torbrowser/maint-2.3] update all stable TBBs to 2.2.39-1 for Tor 0.2.2.39
by erinn＠torproject.org 11 Sep '12

11 Sep '12

commit 3106539e60690a7ec50a6132f328e1dab623e309 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 11 19:11:44 2012 +0100 update all stable TBBs to 2.2.39-1 for Tor 0.2.2.39 --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 7 +++++++ changelog.osx-2.2 | 7 +++++++ changelog.windows-2.2 | 7 +++++++ 10 files changed, 33 insertions(+), 12 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 2ee157d..cd4e9b6 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5.2 + |_ NoScript 2.5.4 |_ HTTPS-Everywhere 2.2.1 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index dc6d794..b317861 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5.2 + |_ NoScript 2.5.4 |_ HTTPS-Everywhere 2.2.1 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 6e8ae48..bf3ee84 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.38 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.7esr \_ Torbutton 1.4.6 - |_ NoScript 2.5.2 + |_ NoScript 2.5.4 |_ HTTPS-Everywhere 2.2.1 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 7e9a20f..137591b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f08b50c..6ceb3e7 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a082236..4640acc 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.38 +RELEASE_VER=2.2.39 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,13 +8,13 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.2.38 +TOR_VER=0.2.2.39 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.7esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.5.2 +NOSCRIPT_VER=2.5.4 HTTPSEVERYWHERE_VER=2.2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a871270..0492f84 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c4b6d52..aee61e2 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.39-1); suite=linux + + * Update Tor to 0.2.2.39 + * Update NoScript to 2.5.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:39 BST 2012 + Tor Browser Bundle (2.2.38-2); suite=linux * Update Firefox to 10.0.7esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index d3b0776..a778ee7 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.39-1); suite=osx + + * Update Tor to 0.2.2.39 + * Update NoScript to 2.5.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:34 BST 2012 + Tor Browser Bundle (2.2.38-2); suite=osx * Update Firefox to 10.0.7esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index a604b2c..b431172 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.2.39-1); suite=windows + + * Update Tor to 0.2.2.39 + * Update NoScript to 2.5.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:09:36 BST 2012 + Tor Browser Bundle (2.2.38-2); suite=windows * Update Firefox to 10.0.7esr

1 0