February 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit ccdf0b319cf83bb7dde3b3c18044ee5ea99a60ac Merge: f7ed4a7 884b371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:25:51 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 "ours" merge to avoid version bumps

1 0

[tor/release-0.2.9] Bump to 0.2.4.28
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 4bab288a822a5312ee2953822563e694c7274afb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:20:46 2017 -0500 Bump to 0.2.4.28 --- configure.ac | 2 +- contrib/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 6ffe3cc..8e70722 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.27]) +AC_INIT([tor],[0.2.4.28]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index a66bcd1..da24244 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.4.27" +!define VERSION "0.2.4.28" !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 baddef6..cca8ad0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.27" +#define VERSION "0.2.4.28"

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 8a1f0876ed329f6c9d73e6ca786cd8437e6bb55b Merge: 3f5a710 f2a3041 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 10:38:05 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug16248 | 8 ++++++++ changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 66 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 1174b50cab48be08b321deced0cfa022160d2c40 Merge: aec45bc 57e778f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:26:45 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux "ours" merge to avoid version bumps

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 67f0b51c9239dd1d2318007e3f503d4e09c3097b Merge: 976f392 8378a33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 19 11:20:03 2015 -0400 Merge branch 'maint-0.2.7' into release-0.2.7 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit aec45bc0b1d5c694b107373f8d6e3ddd1372defc Merge: 8a1f087 f7ed4a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 17 17:10:47 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug20384 | 10 + changes/geoip-february2017 | 4 + changes/trove-2017-001.2 | 8 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- src/or/routerparse.c | 49 +- 6 files changed, 7399 insertions(+), 5155 deletions(-)

1 0

[tor/release-0.3.0] missing parenthesis
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 47649a558de24961c6784f54dcde84debf8c5851 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 20 16:41:28 2015 -0400 missing parenthesis --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0a57f7d..ee3bd69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,7 +34,7 @@ Changes in version 0.2.7.4-rc - 2015-10-20 - Make the get_ifaddrs_* unit tests more tolerant of different network configurations. (Don't assume every test box has an IPv4 address, and Don't assume every test box has a non-localhost - address. Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor". + address.) Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor". - Skip backtrace tests when backtrace support is not compiled in. Fixes part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin Cieślak.

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit ff174995f07747628ad1e71fd344fc27e88a70ed Merge: fbaee1b 5d45a26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:06:47 2015 -0400 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug17398 | 3 +++ changes/bug17401 | 3 +++ changes/bug17402 | 3 +++ src/common/crypto_ed25519.c | 1 + src/or/rendcache.c | 24 ++++++++++++++++-------- 5 files changed, 26 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.0] tomorrow, not tonight.
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit fbaee1bf406f1755324d7503484f5a121a229d52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 20 20:21:23 2015 -0400 tomorrow, not tonight. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee3bd69..3f6c2d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.7.4-rc - 2015-10-20 +Changes in version 0.2.7.4-rc - 2015-10-21 Tor 0.2.7.4-rc is the second release candidate in the 0.2.7 servies. It a few small bugfixes, notably fixes for compilation and portability on different platforms. If no further significant bounds are found,

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit cd8a62a60cbafb61bed8b64e988dacf2b1444668 Merge: 3f3a753 7b859fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 13:35:04 2015 -0400 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug17364 | 3 +++ changes/bug17403 | 3 +++ changes/bug17404 | 6 ++++++ doc/tor.1.txt | 4 ++-- src/common/tortls.c | 4 ++++ src/or/routerkeys.c | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-)

1 0