- tor-commits - lists.torproject.org

[tor/master] dgoulet found some typos in the changelog
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 32b8734ba5d79992c278ad28e2c20ae09917d93d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 13:25:20 2016 -0500 dgoulet found some typos in the changelog --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef75b54..e3f4aa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,7 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? new option KeepBindCapabilities. Closes ticket 8195. o Major features (directory system): - - When bootstrapping we not launch multiple consensus downloads at a + - When bootstrapping multiple consensus downloads at a time, use the first one that starts downloading, and close the rest. This reduces failures when authorities or fallback directories are slow or down. Together with the code for feature @@ -51,7 +51,7 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? 0.2.0.11-alpha. Patch by "teor". o Minor features (security, memory erasure): - - Set the unused entires in a smartlist to NULL. This helped catch + - Set the unused entries in a smartlist to NULL. This helped catch a (harmless) bug, and shouldn't affect performance too much. Implements ticket 17026. - Use SecureMemoryWipe() function to securely clean memory on

1 0

[tor/master] Fix two problems in the 0.2.8.x unit tests
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 1bac468882fd732460d8a25735131d632f977bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 12:30:48 2016 -0500 Fix two problems in the 0.2.8.x unit tests 1. We were sometimes using libevent uninitialized, which is Not Allowed. 2. The malformed-PTR dns test was supposed to get a -1 output... but the test was wrong, since it forgot that in-addr.arpa addresses are in reverse order. Bugs not in any released tor. --- src/test/test.c | 4 ---- src/test/test_circuitmux.c | 4 ---- src/test/test_dns.c | 2 +- src/test/testing_common.c | 5 +++++ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index f12ae21..d671ac8 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -319,11 +319,7 @@ test_circuit_timeout(void *arg) int i, runs; double close_ms; (void)arg; - tor_libevent_cfg cfg; - memset(&cfg, 0, sizeof(cfg)); - - tor_libevent_initialize(&cfg); initialize_periodic_events(); circuit_build_times_init(&initial); diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index 6d93731..5c72fc6 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -36,11 +36,7 @@ test_cmux_destroy_cell_queue(void *arg) circuit_t *circ = NULL; cell_queue_t *cq = NULL; packed_cell_t *pc = NULL; - tor_libevent_cfg cfg; - memset(&cfg, 0, sizeof(cfg)); - - tor_libevent_initialize(&cfg); scheduler_init(); (void) arg; diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 6fdbe90..5289ca5 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -490,7 +490,7 @@ NS(test_main)(void *arg) (void)arg; - TO_CONN(exitconn)->address = tor_strdup("127.0.0.1.in-addr.arpa"); + TO_CONN(exitconn)->address = tor_strdup("1.0.0.127.in-addr.arpa"); NS_MOCK(router_my_exit_policy_is_reject_star); diff --git a/src/test/testing_common.c b/src/test/testing_common.c index e20e9e6..9c7fca0 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -238,6 +238,11 @@ main(int c, const char **v) update_approx_time(time(NULL)); options = options_new(); tor_threads_init(); + + struct tor_libevent_cfg cfg; + memset(&cfg, 0, sizeof(cfg)); + tor_libevent_initialize(&cfg); + control_initialize_event_queue(); init_logging(1); configure_backtrace_handler(get_version());

1 0

[tor/master] Merge branch 'always_init_base'
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit abc9ce324e7a0c6a482a861f48fc6bbf0589986b Merge: 532a43e 1bac468 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 13:20:21 2016 -0500 Merge branch 'always_init_base' src/test/test.c | 4 ---- src/test/test_circuitmux.c | 4 ---- src/test/test_dns.c | 2 +- src/test/testing_common.c | 5 +++++ 4 files changed, 6 insertions(+), 9 deletions(-)

1 0

[tor/master] update the changelog more
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 0fb77ca4a37c9b6830580f6c308e172f56e69475 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 13:18:49 2016 -0500 update the changelog more --- ChangeLog | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d55071..02a9e86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,10 +137,10 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? Country database. o Minor features (IPv6): - - Add a flag ipv6=address:orport to the DirAuthority and FallbackDir - torrc options. Add hard-coded ipv6 addresses for directory - authorities with ipv6 lines in their descriptors. Closes ticket - 17327; patch from Nick Mathewson / "teor". + - Add an argument 'ipv6=address:orport' to the DirAuthority and FallbackDir + torrc options, to specify an IPv6 address for an authority or fallback directory. Add hard-coded ipv6 addresses for directory + authorities that have them. Closes ticket + 17327; patch from Nick Mathewson and "teor". - Add address policy assume_action support for IPv6 addresses. - Limit IPv6 mask bits to 128. - Warn when comparing against an AF_UNSPEC address in a policy, it's @@ -191,7 +191,7 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? need for CAP_READ_SEARCH when using systemd's CapabilityBoundingSet, or dac_read_search when using SELinux. Implements part of ticket 17562. Patch from Jamie Nguyen. - - Introduce DataDirectoryGroupReadable boolean. If set to 1, the + - Introduce a new DataDirectoryGroupReadable option. If it is set to 1, the DataDirectory will be made readable by the default GID. Implements part of ticket 17562. Patch from Jamie Nguyen. @@ -212,17 +212,17 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Minor bugfixes (compilation): - Mark all object files that include micro-revision.i as depending - on it, so as to make our build more reliable with parallel builds. + on it, so as to make parallel builds more reliable. Fixes bug 17826; bugfix on 0.2.5.1-alpha. - - Don't try to use the pthrad_condattr_setclock() function unless it + - Don't try to use the pthread_condattr_setclock() function unless it actually exists. Fixes compilation on NetBSD-6.x. Fixes bug 17819; bugfix on 0.2.6.3-alpha. - Fix backtrace compilation on FreeBSD. Fixes bug 17827; bugfix on tor-0.2.5.2-alpha. - Fix compilation of sandbox.c with musl-libc. Fixes bug 17347; bugfix on 0.2.5.1-alpha. Patch from 'jamestk'. - - Fix search for libevent libraries on OpenBSD (and similar systems - which install libevent 1 and libevent 2 in parallel). Fixes bug + - Fix search for libevent libraries on OpenBSD (and other systems + that install libevent 1 and libevent 2 in parallel). Fixes bug 16651; bugfix on 0.1.0.7-rc. Patch from "rubiate". - Isolate environment variables meant for tests from the rest of the build system. Fixes bug 17818; bugfix on tor-0.2.7.3-rc. @@ -308,25 +308,25 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? - Move logging of redundant policy entries in policies_parse_exit_policy_internal into its own function. Closes ticket 17608; patch from "juce". - - Extract the more complicated parts of circuit_mark_for_close into - a new function run periodically before connections are freed. This + - Extract the more complicated parts of circuit_mark_for_close() into + a new function that we run periodically before circuits are freed. This change removes more than half of the functions currently in the "blob". Closes ticket 17218. - Clean up a little duplicated code in - crypto_expand_key_material_TAP. Closes ticket 17587; patch + crypto_expand_key_material_TAP(). Closes ticket 17587; patch from "pfrankw". - - Decouple the list of streams needing to be attached to circuits + - Decouple the list of streams waiting to be attached to circuits from the overall connection list. This change makes it possible to - attach streams quickly while both simplifying Tor's callgraph and + attach streams quickly while simplifying Tor's callgraph and avoiding O(N) scans of the entire connection list. Closes ticket 17590. - When a direct directory request fails immediately on launch, instead of relaunching that request from inside the code that launches it, instead mark the connection for teardown. This change - simplifies Tor's callback and prevents the directory- request + simplifies Tor's callback and prevents the directory-request launching code from invoking itself recursively. Closes ticket 17589 - - Remove code for OpenSSL dynamic locks; OpenSSL doesn't use them. + - Remove code for configuring OpenSSL dynamic locks; OpenSSL doesn't use them. Closes ticket 17926. o Documentation: @@ -340,7 +340,7 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? issue 17392. o Testing: - - Add unit tests that check for common RNG failure modes, such as + - Add unit tests to check for common RNG failure modes, such as returning all zeroes, identical values, or incrementing values (OpenSSL's rand_predictable feature). Patch by "teor". - Log more information when the backtrace tests fail. Closes ticket

1 0

[tor/master] Reflow the changelog again.
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 532a43ed3ff3b11b3ee23d4abb87ef77a94c4ed6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 13:19:07 2016 -0500 Reflow the changelog again. --- ChangeLog | 170 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02a9e86..ef75b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,76 +2,68 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? Tor 0.2.8.1-alpha is the first alpha release in its series. It includes numerous small features and bugfixes against previous Tor versions, and numerous small infrastructure improvements. The most - notable features are a set of improvements to the directory - subsystem. - - o Major key updates: - - Update the V3 identity key for the dannenberg directory authority: - it was changed on 18 November 2015. Closes task 17906. Patch by - "teor". - - o Removed features: - - Remove client-side support for connecting to Tor servers running - versions of Tor before 0.2.3.6-alpha. These servers didn't support - the v3 TLS handshake protocol, and are no longer allowed on the - Tor network. Implements the client side of ticket 11150. Based on - patches by Tom van der Woerdt. + notable features are a set of improvements to the directory subsystem. o Major features (security, Linux): - - When Tor starts as root on Linux and is told to switch user ID, - it can now retain the capability to bind to low ports. By - default, Tor will do this only when it's switching user ID and - some low ports have been configured. You can change this behavior - with the new option KeepBindCapabilities. Closes ticket 8195. + - When Tor starts as root on Linux and is told to switch user ID, it + can now retain the capability to bind to low ports. By default, + Tor will do this only when it's switching user ID and some low + ports have been configured. You can change this behavior with the + new option KeepBindCapabilities. Closes ticket 8195. o Major features (directory system): - - When bootstrapping we not launch multiple consensus downloads - at a time, use the first one that starts downloading, and close the - rest. This reduces failures when authorities or fallback directories are slow or down. - Together with the code for feature 15775, this feature should reduces failures due - to fallback churn. Implements ticket 4483. - Patch by "teor". Implements IPv4 portions + - When bootstrapping we not launch multiple consensus downloads at a + time, use the first one that starts downloading, and close the + rest. This reduces failures when authorities or fallback + directories are slow or down. Together with the code for feature + 15775, this feature should reduces failures due to fallback churn. + Implements ticket 4483. Patch by "teor". Implements IPv4 portions of proposal 210 by "mikeperry" and "teor". - - Include a trial list of default fallback directories, based - on an opt-in survey of suitable relays. Doing this should make - clients bootstrap more quickly and reliably, and reduce the - load on the directory authorities. Closes ticket 15775. Patch by - "teor". Candidates identified using an OnionOO script by "weasel", "teor", "gsathya", - and "karsten". + - Include a trial list of default fallback directories, based on an + opt-in survey of suitable relays. Doing this should make clients + bootstrap more quickly and reliably, and reduce the load on the + directory authorities. Closes ticket 15775. Patch by "teor". + Candidates identified using an OnionOO script by "weasel", "teor", + "gsathya", and "karsten". - Previously only relays that explicitly opened a directory port (DirPort) accepted directory requests from clients. Now all - relays, with and without a DirPort, - accept and serve tunneled directory requests that they - receive through their ORPort. You can disable this behavior using - the new DirCache option. - Closes ticket 12538. + relays, with and without a DirPort, accept and serve tunneled + directory requests that they receive through their ORPort. You can + disable this behavior using the new DirCache option. Closes + ticket 12538. + + o Major key updates: + - Update the V3 identity key for the dannenberg directory authority: + it was changed on 18 November 2015. Closes task 17906. Patch + by "teor". o Minor features (security, clock): - - Warn when the system clock appears to move back in time (when the state - file was last written in the future). Tor doesn't know that + - Warn when the system clock appears to move back in time (when the + state file was last written in the future). Tor doesn't know that consensuses have expired if the clock is in the past. Patch by "teor". Implements ticket 17188. o Minor features (security, exit policies): - - ExitPolicyRejectPrivate now rejects more private addresses by default. - Specifically, it now rejects the relay's outbound bind addresses (if - configured), and the relay's configured port addresses (such as - ORPort and DirPort). Fixes bug 17027; bugfix on 0.2.0.11-alpha. - Patch by "teor". + - ExitPolicyRejectPrivate now rejects more private addresses by + default. Specifically, it now rejects the relay's outbound bind + addresses (if configured), and the relay's configured port + addresses (such as ORPort and DirPort). Fixes bug 17027; bugfix on + 0.2.0.11-alpha. Patch by "teor". o Minor features (security, memory erasure): - Set the unused entires in a smartlist to NULL. This helped catch a (harmless) bug, and shouldn't affect performance too much. Implements ticket 17026. - Use SecureMemoryWipe() function to securely clean memory on - Windows. Previously we'd use OpenSSL's OPENSSL_cleanse() function. Implements feature 17986. + Windows. Previously we'd use OpenSSL's OPENSSL_cleanse() function. + Implements feature 17986. - Use explicit_bzero or memset_s when present. Previously, we'd use OpenSSL's OPENSSL_cleanse() function. Closes ticket 7419; patches from <logan(a)hackers.mu> and <selven(a)hackers.mu>. - - Make memwipe() do nothing when passed a NULL pointer or buffer of zero size. - Check size argument to memwipe() for underflow. Fixes bug 18089; - bugfix on 0.2.3.25 and 0.2.4.6-alpha. Reported by "gk", patch - by "teor". + - Make memwipe() do nothing when passed a NULL pointer or buffer of + zero size. Check size argument to memwipe() for underflow. Fixes + bug 18089; bugfix on 0.2.3.25 and 0.2.4.6-alpha. Reported by "gk", + patch by "teor". o Minor features (security, RNG): - Adjust Tor's use of OpenSSL's RNG APIs so that they absolutely, @@ -79,17 +71,17 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? internal details of OpenSSL's behavior. Closes ticket 17686. - Never use the system entropy output directly for anything besides seeding the PRNG. When we want to generate important keys, instead - of using system entropy directly, we now hash it with the PRNG stream. - This may help resist certain attacks based on broken OS entropy - implementations. Closes part of ticket 17694. - - Use modern system calls (like getentropy() or getrandom()) to generate strong entropy on platforms - that have them. Closes ticket 13696. + of using system entropy directly, we now hash it with the PRNG + stream. This may help resist certain attacks based on broken OS + entropy implementations. Closes part of ticket 17694. + - Use modern system calls (like getentropy() or getrandom()) to + generate strong entropy on platforms that have them. Closes + ticket 13696. o Minor features (accounting): - - Added two modes to the AccountingRule option: One for limiting only - the number of bytes sent ("AccountingRule out"), and one for - limiting only the number of bytes - received ("AccountingRule in"). + - Added two modes to the AccountingRule option: One for limiting + only the number of bytes sent ("AccountingRule out"), and one for + limiting only the number of bytes received ("AccountingRule in"). Closes ticket 15989; patch from "unixninja92". o Minor features (build): @@ -106,10 +98,10 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? - New 'GETINFO hs/service/desc/id/' command to retrieve a hidden service descriptor from a service's local hidden service descriptor cache. Closes ticket 14846. - - Add 'GETINFO exit-policy/reject-private/[default,relay]', so - controllers can examine the - the reject rules added by ExitPolicyRejectPrivate. This makes - it easier for stem to display exit policies. + - Add 'GETINFO exit-policy/reject-private/[default,relay]', so + controllers can examine the the reject rules added by + ExitPolicyRejectPrivate. This makes it easier for stem to display + exit policies. o Minor features (crypto): - Add SHA512 support to crypto.c. Closes ticket 17663; patch from @@ -124,23 +116,24 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? Fixes bug 17544; bugfix on 0.2.5.3-alpha. o Minor features (directory downloads): - - Wait for busy authorities and fallback directories to become non-busy when - bootstrapping. (A similar change was made in 6c443e987d for - directory caches chosen from the consensus.) Closes ticket 17864; - patch by "teor". + - Wait for busy authorities and fallback directories to become non- + busy when bootstrapping. (A similar change was made in 6c443e987d + for directory caches chosen from the consensus.) Closes ticket + 17864; patch by "teor". - Add UseDefaultFallbackDirs, which enables any hard-coded fallback - directory mirrors. The default is 1; set it to 0 to disable fallbacks. - Implements ticket 17576. Patch by "teor". + directory mirrors. The default is 1; set it to 0 to disable + fallbacks. Implements ticket 17576. Patch by "teor". o Minor features (geoip): - Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2 Country database. o Minor features (IPv6): - - Add an argument 'ipv6=address:orport' to the DirAuthority and FallbackDir - torrc options, to specify an IPv6 address for an authority or fallback directory. Add hard-coded ipv6 addresses for directory - authorities that have them. Closes ticket - 17327; patch from Nick Mathewson and "teor". + - Add an argument 'ipv6=address:orport' to the DirAuthority and + FallbackDir torrc options, to specify an IPv6 address for an + authority or fallback directory. Add hard-coded ipv6 addresses for + directory authorities that have them. Closes ticket 17327; patch + from Nick Mathewson and "teor". - Add address policy assume_action support for IPv6 addresses. - Limit IPv6 mask bits to 128. - Warn when comparing against an AF_UNSPEC address in a policy, it's @@ -191,9 +184,9 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? need for CAP_READ_SEARCH when using systemd's CapabilityBoundingSet, or dac_read_search when using SELinux. Implements part of ticket 17562. Patch from Jamie Nguyen. - - Introduce a new DataDirectoryGroupReadable option. If it is set to 1, the - DataDirectory will be made readable by the default GID. Implements - part of ticket 17562. Patch from Jamie Nguyen. + - Introduce a new DataDirectoryGroupReadable option. If it is set to + 1, the DataDirectory will be made readable by the default GID. + Implements part of ticket 17562. Patch from Jamie Nguyen. o Minor bugfixes (accounting): - The max bandwidth when using 'AccountRule sum' is now correctly @@ -212,11 +205,11 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Minor bugfixes (compilation): - Mark all object files that include micro-revision.i as depending - on it, so as to make parallel builds more reliable. - Fixes bug 17826; bugfix on 0.2.5.1-alpha. - - Don't try to use the pthread_condattr_setclock() function unless it - actually exists. Fixes compilation on NetBSD-6.x. Fixes bug 17819; - bugfix on 0.2.6.3-alpha. + on it, so as to make parallel builds more reliable. Fixes bug + 17826; bugfix on 0.2.5.1-alpha. + - Don't try to use the pthread_condattr_setclock() function unless + it actually exists. Fixes compilation on NetBSD-6.x. Fixes bug + 17819; bugfix on 0.2.6.3-alpha. - Fix backtrace compilation on FreeBSD. Fixes bug 17827; bugfix on tor-0.2.5.2-alpha. - Fix compilation of sandbox.c with musl-libc. Fixes bug 17347; @@ -308,10 +301,10 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? - Move logging of redundant policy entries in policies_parse_exit_policy_internal into its own function. Closes ticket 17608; patch from "juce". - - Extract the more complicated parts of circuit_mark_for_close() into - a new function that we run periodically before circuits are freed. This - change removes more than half of the functions currently in the - "blob". Closes ticket 17218. + - Extract the more complicated parts of circuit_mark_for_close() + into a new function that we run periodically before circuits are + freed. This change removes more than half of the functions + currently in the "blob". Closes ticket 17218. - Clean up a little duplicated code in crypto_expand_key_material_TAP(). Closes ticket 17587; patch from "pfrankw". @@ -326,8 +319,8 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? simplifies Tor's callback and prevents the directory-request launching code from invoking itself recursively. Closes ticket 17589 - - Remove code for configuring OpenSSL dynamic locks; OpenSSL doesn't use them. - Closes ticket 17926. + - Remove code for configuring OpenSSL dynamic locks; OpenSSL doesn't + use them. Closes ticket 17926. o Documentation: - Add a description of the correct use of the '--keygen' command- @@ -339,6 +332,13 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? whenever we mention a document that belongs in torspce. Fixes issue 17392. + o Removed features: + - Remove client-side support for connecting to Tor servers running + versions of Tor before 0.2.3.6-alpha. These servers didn't support + the v3 TLS handshake protocol, and are no longer allowed on the + Tor network. Implements the client side of ticket 11150. Based on + patches by Tom van der Woerdt. + o Testing: - Add unit tests to check for common RNG failure modes, such as returning all zeroes, identical values, or incrementing values

1 0

[tor/master] Bump version. (This is not yet the release.)
by nickm＠torproject.org 04 Feb '16

04 Feb '16

commit 5da517e6897c4b997bb165dfd11e95f8f9c2bbbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 4 10:07:06 2016 -0500 Bump version. (This is not yet the release.) --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6d2312d..1a78f41 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.8.0-alpha-dev]) +AC_INIT([tor],[0.2.8.1-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 2da4210..d5866aa 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.0-alpha-dev" +!define VERSION "0.2.8.1-alpha" !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 c0b14e5..7c6159e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.0-alpha-dev" +#define VERSION "0.2.8.1-alpha"

1 0

[torspec/master] typo and clarification for proposal 249
by arma＠torproject.org 04 Feb '16

04 Feb '16

commit e46dbd41b168580b30545232fedcadc6435cac11 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 4 09:49:36 2016 -0500 typo and clarification for proposal 249 --- proposals/249-large-create-cells.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/proposals/249-large-create-cells.txt b/proposals/249-large-create-cells.txt index 69020cf..e04b4c0 100644 --- a/proposals/249-large-create-cells.txt +++ b/proposals/249-large-create-cells.txt @@ -37,7 +37,7 @@ Status: Draft }; struct created2v_cell_body { - /* Handshake replay length */ + /* Handshake reply length */ u16 hlen; /* Handshake reply data */ u8 hdata[hlen]; @@ -84,8 +84,10 @@ Status: Draft Note that this change leaks the size of the handshake being used to intermediate relays. We should analyze this and see whether it matters. - Clients MAY send RELAY_DROP cells during circuit construction in order to - hide the true size of their handshakes. + Clients and relays MAY send RELAY_DROP cells during circuit + construction in order to hide the true size of their handshakes + (but they can't send these drop cells inside a train of EXTEND2 or + EXTENDED2 cells for a given handshake). 5. Example

1 0

[torspec/master] grammar fixes on proposal 263
by arma＠torproject.org 04 Feb '16

04 Feb '16

commit 04b3871b5cc005d615065e638beb48da7a90e4e5 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 4 09:34:55 2016 -0500 grammar fixes on proposal 263 --- proposals/263-ntru-for-pq-handshake.txt | 39 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/proposals/263-ntru-for-pq-handshake.txt b/proposals/263-ntru-for-pq-handshake.txt index e1bd700..149f0a4 100644 --- a/proposals/263-ntru-for-pq-handshake.txt +++ b/proposals/263-ntru-for-pq-handshake.txt @@ -17,8 +17,8 @@ Status: Open and a quantum-safe key encapsulation mechanism where - 0X0101 ntor+qsh -- refers this modular design, no specific KEM is - assigned. + 0X0101 ntor+qsh -- refers to this modular design; no specific Key + Encapsulation Mechanism (KEM) is assigned. 0X0101 ntor+ntru -- the quantum safe KEM is based on NTRUEncrypt, with parameter ntrueess443ep1 @@ -29,8 +29,8 @@ Status: Open 0X0103 ntor+rlwe -- the quantum safe KEM is based on ring learning with error encryption scheme; parameter not specified - DEPENDENCY: - Proposal 249: Allow CREATE cells with >505 bytes of handshake data + DEPENDENCY: + Proposal 249: Allow CREATE cells with >505 bytes of handshake data 1.1 Motivation: Quantum-safe forward-secure key agreement @@ -41,17 +41,17 @@ Status: Open key is compromised due to attackers with quantum-computing capabilities, the prior communication still remains secure. - Current approaches for handling key agreement, for instance, the ntor + Current approaches for handling key agreement, for instance the ntor handshake protocol, do not have this feature. ntor uses ECC, which will be broken when quantum computers become available. This allows the simple yet very effective harvest-then-decrypt attack, where an adversary with - significant storage capabilities harvests Tor handshakes now and decrypt + significant storage capabilities harvests Tor handshakes now and decrypts them in the future. The proposed handshake protocol achieves quantum-safe forward-secrecy and stops those attacks by introducing a secondary short-term pre-master secret - that is transported via a quantum-safe method. In the case where long-term - key is compromised via quantum algorithm, the attacker still need to recover + that is transported via a quantum-safe method. In the case where the long-term + key is compromised via quantum algorithm, the attacker still needs to recover the second pre-master secret to be able to decrypt the communication. 1.2 Motivation: Allowing plug & play for quantum-safe encryption algorithms @@ -104,7 +104,7 @@ Status: Open 2.1.2 General idea: When a client wishes to establish a one-way authenticated key K with a - server, through following steps a session key is established: + server, a session key is established through the following steps: 1) Establish a common secret E (classical cryptography, i.e., ECC) using a one-way authenticated key exchange protocol. #ntor currently uses this approach#; @@ -141,7 +141,7 @@ Status: Open * QSC_LENGTH = XXX length of QSE cipher * PROTOID = "ntor-curve25519-sha3-1-[qseid]" -#pre PORTOID = "ntor-curve25519-sha256-1" +#pre PROTOID = "ntor-curve25519-sha256-1" t_mac = PROTOID | ":mac" t_key = PROTOID | ":key_extract" @@ -176,7 +176,7 @@ Status: Open The client generates a temporary key pair: x, X = KEYGEN(); - an QSE temporary key pair: + and a QSE temporary key pair: * QSSK, QSPK = QSKEYGEN(); ================================================================================ @@ -190,7 +190,7 @@ Status: Open The server generates an ephemeral curve25519 keypair: y, Y = KEYGEN(); - a ephemeral "parallel" secret for encryption with QSE: + and an ephemeral "parallel" secret for encryption with QSE: * PAR_SEC P [H_LENGTH bytes] and computes: @@ -240,7 +240,7 @@ Status: Open The example uses the NTRU parameter set NTRU_EESS443EP1. This has keys and ciphertexts of length 610 bytes. This parameter set delivers 128 bits - classical security and quantum security. For 256 bits classcial and quantum + classical security and quantum security. For 256 bits classical and quantum security, use NTRU_EESS743EP1. We adjust the following parameters: @@ -269,15 +269,15 @@ Status: Open model can be found at https://eprint.iacr.org/2015/287. 3.3 Cryptographic hash function - The default hash function HMAC_SHA256 from Tor. This is suffice to provide + The default hash function HMAC_SHA256 from Tor suffices to provide desired security for the present day. However, to be more future proof, we - propose to use HMAC_SHA3 when Tor starts to migrant to SHA3. + propose to use HMAC_SHA3 when Tor starts to migrate to SHA3. 3.4 Key Encapsulation Mechanism The KEM in our protocol can be proved to be KEM-CCA-2 secure. 3.5 Quantum-safe Forward Secrecy - The quantum-safe forward secrecy is achieved. + Quantum-safe forward secrecy is achieved. 3.6 Quantum-safe authentication The proposed protocol is secure only until a quantum computer is developed @@ -291,9 +291,9 @@ Status: Open 4. Candidate quantum-safe encryption algorithms We do not propose any quantum-safe encryption algorithms in this proposal. - This documents focus on the hybrid design. The implementer should modularize - the protocol with appropriate interfaces that allows any quantum-safe - encryption algorithms to be used in this setting. + This document focuses on the hybrid design. The implementer should modularize + the protocol with appropriate interfaces that allow any quantum-safe + encryption algorithm to be used in this setting. Candidate quantum-safe encryption algorithms will be included in another proposal. This document will refer to the proposal when both proposals are @@ -306,3 +306,4 @@ Status: Open Theory of Cryptography Conference, 2005. http://link.springer.com/chapter/10.1007%2F978-3-540-30576-7_11 (conference version) or http://cs.nyu.edu/~dodis/ps/2enc.pdf (preprint) +

1 0

[tor-messenger-build/master] Add a patch for 17896
by arlo＠torproject.org 04 Feb '16

04 Feb '16

commit 9aca53a522c399d291b8e0ad81c06583792327db Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Feb 4 01:36:30 2016 -0800 Add a patch for 17896 * Add Edit menu to the conversation window on OS X --- ChangeLog | 2 + projects/instantbird/config | 1 + projects/instantbird/trac-17896.patch | 89 +++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/ChangeLog b/ChangeLog index 92f886b..0b2dba9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Tor Messenger -- * All Platforms * Bug 13795: Remove SPI root certificate because Debian no longer ships it * Bug 18094: Remove references to torbutton from start-tor-messenger script + * Mac + * Bug 17896: Add Edit menu to the conversation window on OS X Tor Messenger 0.1.0b4 -- November 22 2015 * All Platforms diff --git a/projects/instantbird/config b/projects/instantbird/config index 213e413..8471b82 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -72,6 +72,7 @@ input_files: - filename: xmpp-gtalk-resource.patch - filename: trac-17552.patch - filename: trac-16489.patch + - filename: trac-17896.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/trac-17896.patch b/projects/instantbird/trac-17896.patch new file mode 100644 index 0000000..41781e1 --- /dev/null +++ b/projects/instantbird/trac-17896.patch @@ -0,0 +1,89 @@ +# HG changeset patch +# User aleth <aleth(a)instantbird.org> +# Date 1454183798 -3600 +# Sat Jan 30 20:56:38 2016 +0100 +# Node ID 6eac77f5536560efd9028d80faa8df716d20907a +# Parent bd360247708a91a220b79303b4c0f59be61520f9 +Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian + +Adding an edit menu also enables the emoji panel and dictation. + +diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul +--- a/im/content/instantbird.xul ++++ b/im/content/instantbird.xul +@@ -43,17 +43,38 @@ + #else + <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> + #endif + <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/> + <script type="application/javascript" src="chrome://instantbird/content/convZoom.js"/> + <script type="application/javascript" src="chrome://instantbird/content/nsContextMenu.js"/> + + #ifdef XP_MACOSX +-#include menus.xul.inc ++# As menus.xul.inc, but with an Edit menu. ++ <commandset id="maincommandset"/> ++ <keyset id="mainkeyset"/> ++ <menubar id="blistMenubar"> ++ <menu id="menu_edit"> ++ <menupopup id="menu_editpopup"> ++ <menuitem id="menu_undo"/> ++ <menuitem id="menu_redo"/> ++ <menuseparator/> ++ <menuitem id="menu_cut"/> ++ <menuitem id="menu_copy"/> ++ <menuitem id="menu_paste"/> ++ <menuitem id="menu_delete"/> ++ <menuseparator/> ++ <menuitem id="menu_selectAll"/> ++ <menuseparator/> ++ <menuitem id="menu_find"/> ++ <menuitem id="menu_findAgain"/> ++ </menupopup> ++ </menu> ++ </menubar> ++ <popupset id="mainPopupSet"/> + #endif + + <commandset id="conversationsCommands"> + <command id="cmd_newtab" oncommand="Conversations.showNewTab()"/> + <command id="cmd_close" oncommand="getTabBrowser().removeCurrentTab()"/> + <command id="cmd_putOnHold" + oncommand="var tabbrowser = getTabBrowser(); + if (!tabbrowser.selectedConversation) return; +diff --git a/im/content/menus.xul b/im/content/menus.xul +--- a/im/content/menus.xul ++++ b/im/content/menus.xul +@@ -38,17 +38,17 @@ + <key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/> + <key id="joinChatkey" key="&joinChat.commandkey;" command="cmd_joinchat" modifiers="accel"/> + <key id="addBuddykey" key="&addContact.commandkey;" command="cmd_addbuddy" modifiers="accel"/> + <key id="newtabkey" key="&newtab.commandkey;" command="cmd_newtab" modifiers="accel"/> + <key id="addonskey" key="&addonManager.commandkey;" command="cmd_addons" modifiers="accel"/> + </keyset> + + <menubar id="blistMenubar"> +- <menu label="&file.menu;" id="fileMenu" accesskey="&file.accesskey;"> ++ <menu label="&file.menu;" id="fileMenu" accesskey="&file.accesskey;" insertbefore="menu_edit"> + <menupopup id="fileMenuPopup" onpopupshowing="menus.updateFileMenuitems();"> + <menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/> + <menuitem id="newTabMenuItem" label="&newtab;" command="cmd_newtab" key="newtabkey" accesskey="&newtab.accesskey;"/> + <menuitem id="joinChatMenuItem" label="&joinChat;" command="cmd_joinchat" key="joinChatkey" accesskey="&joinChat.accesskey;"/> + <menuseparator/> + <menu id="setStatusTo" label="&setStatusTo;" oncommand="menus.setStatus(event);" accesskey="&setStatusTo.accesskey;" > + <menupopup id="setStatusMenupopup">  + <menuitem id="statusAvailable" status="available" label="&available;" accesskey="&available.accesskey;" class="menuitem-iconic"/> +diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc +--- a/im/content/menus.xul.inc ++++ b/im/content/menus.xul.inc +@@ -1,8 +1,10 @@ + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + ++# Note instantbird.xul contains a modified copy of this file that ++# should be kept in sync. + <commandset id="maincommandset"/> + <keyset id="mainkeyset"/> + <menubar id="blistMenubar"/> + <popupset id="mainPopupSet"/>

1 0

[tor-browser-bundle/maint-5.5] Preparing build3
by gk＠torproject.org 04 Feb '16

04 Feb '16

commit a80752763e5a3e5ae0a71a6c11bce10a6474ff69 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 4 09:23:29 2016 +0000 Preparing build3 --- Bundle-Data/Docs/ChangeLog.txt | 5 ++++- gitian/versions | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 286b370..525d2b3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,13 @@ Tor Browser 5.5.1 -- February 4 2016 * All Platforms * Bug 18168: Don't clear an iframe's window.name (fix of #16620) - * Bug 18172: Add Emoji support * Bug 18137: Add two new obfs4 default bridges * Windows * Bug 18169: Whitelist zh-CN UI font + * OS X + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support Tor Browser 5.5 -- January 26 2016 * All Platforms diff --git a/gitian/versions b/gitian/versions index a3e9f2f..26e8cd2 100755 --- a/gitian/versions +++ b/gitian/versions @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3

1 0