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

[tor/release-0.3.1] changelog: logic correction
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 7377c0bc060788687a3474b21a6c89cce2aed2fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:44:59 2017 -0400 changelog: logic correction --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e2b231..d9765be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,7 +30,7 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 o Major bugfixes (directory protocol): - Ensure that we send "304 Not modified" as HTTP status code when a client is attempting to fetch a consensus or consensus diff, and - the best one we can send them is one we already have. Fixes bug + the best one we can send them is one they already have. Fixes bug 22702; bugfix on 0.3.1.1-alpha. o Major bugfixes (entry guards):

1 0

[tor/release-0.3.1] changelog: typo fix.
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 01de8edd274240ce1111fe95ed890fea148aecb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:44:16 2017 -0400 changelog: typo fix. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b1ae96..3e2b231 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,7 +23,7 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 006 and CVE-2017-0377. o Major bugfixes (compression, zstd): - - Correctly detect a full buffer when decompessing a large zstd- + - Correctly detect a full buffer when decompressing a large zstd- compressed input. Previously, we would sometimes treat a full buffer as an error. Fixes bug 22628; bugfix on 0.3.1.1-alpha.

1 0

[tor/release-0.3.1] changelog: drop inconsistent parens.
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 2b393776cf3950149b16b3403a76ec4e13556108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:44:01 2017 -0400 changelog: drop inconsistent parens. --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c60633d..0b1ae96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,8 +24,8 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 o Major bugfixes (compression, zstd): - Correctly detect a full buffer when decompessing a large zstd- - compressed input. (Previously, we would sometimes treat a full - buffer as an error.) Fixes bug 22628; bugfix on 0.3.1.1-alpha. + compressed input. Previously, we would sometimes treat a full + buffer as an error. Fixes bug 22628; bugfix on 0.3.1.1-alpha. o Major bugfixes (directory protocol): - Ensure that we send "304 Not modified" as HTTP status code when a

1 0

[tor/maint-0.3.0] Update maint-0.3.0 to 0.3.0.9
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 98ffb2e722316568b2bbec7969c12db3663081d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:35:40 2017 -0400 Update maint-0.3.0 to 0.3.0.9 --- 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 218de29..6c6eb6c 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.8-dev]) +AC_INIT([tor],[0.3.0.9]) 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 010d390..57821bc 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.8-dev" +!define VERSION "0.3.0.9" !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 231da06..96d16bd 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.8-dev" +#define VERSION "0.3.0.9"

1 0

[tor/maint-0.3.1] Update maint-0.3.0 to 0.3.0.9
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 98ffb2e722316568b2bbec7969c12db3663081d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:35:40 2017 -0400 Update maint-0.3.0 to 0.3.0.9 --- 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 218de29..6c6eb6c 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.8-dev]) +AC_INIT([tor],[0.3.0.9]) 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 010d390..57821bc 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.8-dev" +!define VERSION "0.3.0.9" !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 231da06..96d16bd 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.8-dev" +#define VERSION "0.3.0.9"

1 0

[tor/master] Update maint-0.3.0 to 0.3.0.9
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 98ffb2e722316568b2bbec7969c12db3663081d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:35:40 2017 -0400 Update maint-0.3.0 to 0.3.0.9 --- 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 218de29..6c6eb6c 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.8-dev]) +AC_INIT([tor],[0.3.0.9]) 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 010d390..57821bc 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.8-dev" +!define VERSION "0.3.0.9" !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 231da06..96d16bd 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.8-dev" +#define VERSION "0.3.0.9"

1 0

[tor/maint-0.3.1] Bump 0.3.1 to 0.3.1.4-alpha
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit a53573559fc97b0931ec67a0ad27b796c305ff06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:50 2017 -0400 Bump 0.3.1 to 0.3.1.4-alpha --- 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 0c673d0..bbc60c3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.3-alpha-dev]) +AC_INIT([tor],[0.3.1.4-alpha]) 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 d3df391..e1b8bc5 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.1.3-alpha-dev" +!define VERSION "0.3.1.4-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 696f6fe..668f0b6 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.1.3-alpha-dev" +#define VERSION "0.3.1.4-alpha"

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 1494fa0d3b2a3902d0555bc5cc557b88c6130f48 Merge: 1712dc9 98ffb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 1494fa0d3b2a3902d0555bc5cc557b88c6130f48 Merge: 1712dc9 98ffb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 29 Jun '17

29 Jun '17

commit 1494fa0d3b2a3902d0555bc5cc557b88c6130f48 Merge: 1712dc9 98ffb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 29 16:36:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

1 0