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

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

28 Feb '17

commit b2b604ecb4df95526a309c9ff507dff942472daa Merge: aeb299b 4bab288 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:22:36 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 "ours" merge to avoid bumping version

1 0

[tor/maint-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/maint-0.2.9] Bump version to 0.2.7.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit b5526bef384524badbd1411ad9570e6373438b06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:27:20 2017 -0500 Bump version to 0.2.7.7 --- 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 d37c34d..80c4d3c 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.7.6-dev]) +AC_INIT([tor],[0.2.7.7]) 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 08cef8d..f20c1a6 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.7.6-dev" +!define VERSION "0.2.7.7" !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 8b687c8..57385c9 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.7.6-dev" +#define VERSION "0.2.7.7"

1 0

[tor/maint-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/maint-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/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3e07a54928c3b14b4eb86b05251564c3e16504c4 Merge: 67cec75 f93bcab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:38:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 This is an "ours" merge to avoid taking a version bump

1 0

[tor/maint-0.2.9] bump version to 0.2.8.13
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit f2a657c22bf47fe4fd8103a1117e1e46af30969c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:34:33 2017 -0500 bump version to 0.2.8.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 200ea02..9c6d95d 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.12-dev]) +AC_INIT([tor],[0.2.8.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 7152e43..ae477b8 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.12-dev" +!define VERSION "0.2.8.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 26f9950..b61f59f 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.12-dev" +#define VERSION "0.2.8.13"

1 0

[tor/maint-0.2.9] Use the correct bug #. For real this time. Thanks again, skruffy
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 7a489a638911012069981702065b952a5809d249 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 11:20:24 2015 -0500 Use the correct bug #. For real this time. Thanks again, skruffy --- ChangeLog | 2 +- ReleaseNotes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfa5673..a71f900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ Changes in version 0.2.7.6 - 2015-12-10 guard. When we implemented the directory guard design, we accidentally started treating all relays as if they have the Guard flag during guard selection, leading to weaker anonymity and worse - performance. Fixes bug 17722; bugfix on 0.2.4.8-alpha. Discovered + performance. Fixes bug 17772; bugfix on 0.2.4.8-alpha. Discovered by Mohsen Imani. o Minor features (geoip): diff --git a/ReleaseNotes b/ReleaseNotes index 8fe6359..f16a46a 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -11,7 +11,7 @@ Changes in version 0.2.7.6 - 2015-12-10 guard. When we implemented the directory guard design, we accidentally started treating all relays as if they have the Guard flag during guard selection, leading to weaker anonymity and worse - performance. Fixes bug 17722; bugfix on 0.2.4.8-alpha. Discovered + performance. Fixes bug 17772; bugfix on 0.2.4.8-alpha. Discovered by Mohsen Imani. o Minor features (geoip):

1 0

[tor/maint-0.2.9] Bump version to 0.2.5.13
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 884b3717a92465a3d6ab31d819e4011d3d929b3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:23:20 2017 -0500 Bump version to 0.2.5.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 29ba2fd..8f85dae 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.5.12]) +AC_INIT([tor],[0.2.5.13]) 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 2fb15b8..9661e10 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.5.12" +!define VERSION "0.2.5.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 6d6cde4..aa04092 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.5.12" +#define VERSION "0.2.5.13"

1 0

[tor/maint-0.2.9] Bump the version to 0.2.7.6-dev again
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 5b60bd84f258af4bcf6a993bce76ad382a99ec91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:59:54 2017 -0500 Bump the version to 0.2.7.6-dev again --- 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 6c72971..d37c34d 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.7.6]) +AC_INIT([tor],[0.2.7.6-dev]) 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 07cc315..08cef8d 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.7.6" +!define VERSION "0.2.7.6-dev" !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 822e261..8b687c8 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.7.6" +#define VERSION "0.2.7.6-dev"

1 0