tor-commits December 2017

tor-commits@lists.torproject.org

14 participants
2422 discussions

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 2e219291bee2d378344286ba091ba09527b07188 Merge: ba4a9cf0c 6bda6777c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:21:36 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" to avoid version bump

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit cef844d0179e7ef6721795ef1c449f5e4ed24e73 Merge: 6c355d576 fd73a168c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24313 | 5 +++++ changes/trove-2017-009 | 10 ++++++++++ changes/trove-2017-010 | 6 ++++++ changes/trove-2017-011 | 8 ++++++++ changes/trove-2017-012-part1 | 6 ++++++ changes/trove-2017-012-part2 | 5 +++++ src/common/crypto.c | 16 +++++++++++++--- src/or/entrynodes.c | 3 ++- src/or/protover.c | 5 +++++ src/or/rendservice.c | 8 +++++++- src/or/routerlist.c | 5 ++++- 11 files changed, 71 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 1fd6e25522ed064e8043f4548fbd33fca9246295 Merge: 7e2b012b4 6ee447254 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:22:38 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump.

1 0

[tor/master] version bump to 0.2.8.17
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 6ee44725449794951f93020bb04e5fa3ba784742 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:22:32 2017 -0500 version bump to 0.2.8.17 --- 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 6fb101bf9..94cebf401 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.16-dev]) +AC_INIT([tor],[0.2.8.17]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index b9eac37c5..b9076fbc7 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.16-dev" +!define VERSION "0.2.8.17" !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 211243d1d..9db6ef209 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.16-dev" +#define VERSION "0.2.8.17"

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 8f36104574a6dcce6e6dbb9b49e1f3766ab56441 Merge: 5fc0587c0 16c9cfd65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:24:13 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa Merge: 25d50decb ee48eb1eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24313 | 5 +++++ changes/trove-2017-009 | 10 ++++++++++ changes/trove-2017-010 | 6 ++++++ changes/trove-2017-011 | 8 ++++++++ changes/trove-2017-012-part1 | 6 ++++++ changes/trove-2017-012-part2 | 5 +++++ src/common/crypto.c | 16 +++++++++++++--- src/or/entrynodes.c | 3 ++- src/or/protover.c | 5 +++++ src/or/rendservice.c | 8 +++++++- src/or/routerlist.c | 5 ++++- 11 files changed, 71 insertions(+), 6 deletions(-) diff --cc src/or/routerlist.c index 355f8e0fa,507580f19..af4f67dc1 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -2825,21 -2810,17 +2825,24 @@@ router_choose_random_node(smartlist_t * rule = weight_for_exit ? WEIGHT_FOR_EXIT : (need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID); - /* Exclude relays that allow single hop exit circuits. This is an obsolete - * option since 0.2.9.2-alpha and done by default in 0.3.1.0-alpha. */ - SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node, + SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), node_t *, node) { if (node_allows_single_hop_exits(node)) { + /* Exclude relays that allow single hop exit circuits. This is an + * obsolete option since 0.2.9.2-alpha and done by default in + * 0.3.1.0-alpha. */ smartlist_add(excludednodes, node); - }); + } else if (rendezvous_v3 && + !node_supports_v3_rendezvous_point(node)) { + /* Exclude relays that do not support to rendezvous for a hidden service + * version 3. */ + smartlist_add(excludednodes, node); + } + } SMARTLIST_FOREACH_END(node); - if ((r = routerlist_find_my_routerinfo())) + /* If the node_t is not found we won't be to exclude ourself but we + * won't be able to pick ourself in router_choose_random_node() so + * this is fine to at least try with our routerinfo_t object. */ + if ((r = router_get_my_routerinfo())) routerlist_add_node_and_family(excludednodes, r); router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity,

1 0

[tor/master] version bump to 0.3.0.13
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit f2ecdeb724c68f854f00a0095a0849627fd4e17b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:25:01 2017 -0500 version bump to 0.3.0.13 --- 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 315bd2df3..10612eba2 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.12-dev]) +AC_INIT([tor],[0.3.0.13]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 160ef2675..bd8cf3d5c 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.3.0.12-dev" +!define VERSION "0.3.0.13" !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 f5a7451a5..5795552a4 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.12-dev" +#define VERSION "0.3.0.13"

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 9c89e8e4354283e4596e82adb876653d4c95ac6c Merge: fd73a168c 4ebd43654 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:25:53 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bumps

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 5fc0587c040339357bc3fc37f1b5474f1c3d1a33 Merge: d459c08b7 7e2b012b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24313 | 5 +++++ changes/trove-2017-009 | 10 ++++++++++ changes/trove-2017-010 | 6 ++++++ changes/trove-2017-011 | 8 ++++++++ changes/trove-2017-012-part1 | 6 ++++++ src/common/crypto.c | 16 +++++++++++++--- src/or/protover.c | 5 +++++ src/or/rendservice.c | 8 +++++++- src/or/routerlist.c | 5 ++++- 9 files changed, 64 insertions(+), 5 deletions(-)

1 0

[tor/master] version bump to 0.2.9.14
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 16c9cfd6588d04440b355a4cb8599bb7e7dd9702 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 12:24:07 2017 -0500 version bump to 0.2.9.14 --- 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 f2c3f90ba..3e8084cde 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.13-dev]) +AC_INIT([tor],[0.2.9.14]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 919115b75..c5d2d7e89 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.9.13-dev" +!define VERSION "0.2.9.14" !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 9c9166be1..46cd55dd6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.13-dev" +#define VERSION "0.2.9.14"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2017