tor-commits November 2018

tor-commits@lists.torproject.org

19 participants
2292 discussions

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit a6240d578efcd381fb89974211a52121bc823c4a Merge: d3769dd4d d8d4fe83d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:09:01 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 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.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit ff05162710cb514b3c0c054b034dc9c2bd66e97d Merge: bbdf56aed d8d4fe83d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:08:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.

1 0

[tor/release-0.3.5] Bump to 0.3.4.9
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit d8d4fe83d0c9409b83aab727eab4e1dc700323d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:08:45 2018 -0400 Bump to 0.3.4.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 579c34947..ac0dd9667 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.4.8-dev]) +AC_INIT([tor],[0.3.4.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 3ebd6a359..1a72ee30e 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.4.8-dev" +!define VERSION "0.3.4.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 b4a2f667a..dd53f6d03 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.4.8-dev" +#define VERSION "0.3.4.9"

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit bbdf56aed625b67a8675ad3441afe76198a8a8bc Merge: a3fc93b8d bfe8f50cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:38 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace Merge: f288f2478 6bd069630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:37 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug26470_032' into maint-0.3.3
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 6bd069630a64e540cb118ad84c2bcbb470ce92f8 Merge: e847909b7 ff0be0805 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:32 2018 -0400 Merge branch 'bug26470_032' into maint-0.3.3 changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit b71f93f532fc8d509eb241c52b832240e038981d Merge: a0ab950bf bbdf56aed Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:38 2018 -0400 Merge branch 'maint-0.3.5'

1 0

[tor/release-0.3.3] Fix a bug warning when sending an error on an HTTPTunnelPort conn
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit ff0be080598a8719032fd8c57aed9a42888b97b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:12:04 2018 -0400 Fix a bug warning when sending an error on an HTTPTunnelPort conn Fixes bug 26470; bugfix on 0.3.2.1-alpha. --- changes/bug26470 | 4 ++++ src/or/connection_edge.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug26470 b/changes/bug26470 new file mode 100644 index 000000000..854ec7ea7 --- /dev/null +++ b/changes/bug26470 @@ -0,0 +1,4 @@ + o Minor bugfixes (HTTP tunnel): + - Fix a bug warning when closing an HTTP tunnel connection due to + an HTTP request we couldn't handle. Fixes bug 26470; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f178917f0..b4e544c8f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2537,8 +2537,11 @@ connection_ap_process_http_connect(entry_connection_t *conn) err: if (BUG(errmsg == NULL)) errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n"; - log_warn(LD_EDGE, "Saying %s", escaped(errmsg)); + log_info(LD_EDGE, "HTTP tunnel error: saying %s", escaped(errmsg)); connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn)); + /* Mark it as "has_finished" so that we don't try to send an extra socks + * reply. */ + conn->socks_request->has_finished = 1; connection_mark_unattached_ap(conn, END_STREAM_REASON_HTTPPROTOCOL| END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -4162,4 +4165,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } -

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2018