tor-commits September 2012

tor-commits@lists.torproject.org

18 participants
792 discussions

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit 2293bc5112bcb0098df9835a84d8ebfc58316f83 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 12:45:36 2012 +0000 Update translations for https_everywhere_completed --- eu/https-everywhere.properties | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/eu/https-everywhere.properties b/eu/https-everywhere.properties index 54bb6eb..c065c6f 100644 --- a/eu/https-everywhere.properties +++ b/eu/https-everywhere.properties @@ -1,3 +1,5 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere gaitu https-everywhere.menu.globalDisable = HTTPS Everywhere ezgaitu - +https-everywhere.menu.enableDisable = Gaitu / Ezgaitu arauak +https-everywhere.menu.noRules = (Araurik ez gune honetarako) +https-everywhere.menu.unknownRules = (Gune honetarako arauak ezezagunak)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit a8aecf81327a2d3e71e5368fc1b776cb7cc7d482 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 12:45:33 2012 +0000 Update translations for https_everywhere --- eu/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/https-everywhere.properties b/eu/https-everywhere.properties index 1abaa0a..c065c6f 100644 --- a/eu/https-everywhere.properties +++ b/eu/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere gaitu https-everywhere.menu.globalDisable = HTTPS Everywhere ezgaitu -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Gaitu / Ezgaitu arauak +https-everywhere.menu.noRules = (Araurik ez gune honetarako) +https-everywhere.menu.unknownRules = (Gune honetarako arauak ezezagunak)

1 0

[flashproxy/master] Remove unused Badge.set_color.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit 0cb225d316daa1fac671bcdd5dc19c55b2259c47 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 10 21:35:28 2012 -0700 Remove unused Badge.set_color. --- flashproxy.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 7e5a28d..32eb534 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -784,10 +784,6 @@ function Badge() { this.elem.className = "dead"; this.disable_button.style.display = "none"; } - - this.set_color = function(color) { - this.elem.style.backgroundColor = color; - }; } function quote(s) {

1 0

[flashproxy/master] Check PATH info for a path of /.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit a6cc1d6108a82131473fe295ca785f98eb140388 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 10 21:03:51 2012 -0700 Check PATH info for a path of /. --- facilitator/facilitator.cgi | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 39566d3..6ccb479 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -2,6 +2,7 @@ import cgi import os +import os.path import socket import sys import urllib @@ -68,14 +69,19 @@ def get_reg(proxy_addr): exit_error(500) method = os.environ.get("REQUEST_METHOD") +path_info = os.environ.get("PATH_INFO") proxy_addr = (os.environ.get("REMOTE_ADDR"), None) -if not method or not proxy_addr[0]: +if not method or not path_info or not proxy_addr[0]: exit_error(400) +path = os.path.normpath(path_info) + fs = cgi.FieldStorage() def do_get(): + if path != "/": + exit_error(400) try: reg = get_reg(proxy_addr) or "" except: @@ -90,6 +96,8 @@ Access-Control-Allow-Origin: *\r sys.stdout.write(urllib.urlencode(reg)) def do_post(): + if path != "/": + exit_error(400) client_specs = fs.getlist("client") if len(client_specs) != 1: exit_error(400)

1 0

[tor/master] Bump version to 0.2.4.2-alpha-dev
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 99cb9696ac617a42a78d9ebfa3f169fd8e4a3d88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 19:49:20 2012 -0400 Bump version to 0.2.4.2-alpha-dev --- 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 990fba9..ab291b1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.2-alpha]) +AC_INIT([tor],[0.2.4.2-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 904a022..96e27b4 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.2-alpha" +!define VERSION "0.2.4.2-alpha-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 1a2ae57..beebc6d 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.4.2-alpha" +#define VERSION "0.2.4.2-alpha-dev"

1 0

r25788: {website} i guess we need to bump the version here too (website/trunk)
by Roger Dingledine 10 Sep '12

10 Sep '12

Author: arma Date: 2012-09-10 22:56:01 +0000 (Mon, 10 Sep 2012) New Revision: 25788 Modified: website/trunk/Makefile Log: i guess we need to bump the version here too Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-09-09 01:11:48 UTC (rev 25787) +++ website/trunk/Makefile 2012-09-10 22:56:01 UTC (rev 25788) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.38 -export DEVTAG=tor-0.2.3.20-rc +export DEVTAG=tor-0.2.3.21-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

[tor/master] Avoid segfault when reading state file from ancient tor
by arma＠torproject.org 10 Sep '12

10 Sep '12

commit 8731a4e148e23d8edbb7f32bdfeee30c326f33cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:35:18 2012 -0400 Avoid segfault when reading state file from ancient tor If s_values is null in rep_hist_load_bwhist_state_section, we would call smartlist_len() on it, and die. Fixes bug 6801. --- changes/bug6801 | 5 +++++ src/or/rephist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug6801 b/changes/bug6801 new file mode 100644 index 0000000..ef21acc --- /dev/null +++ b/changes/bug6801 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix on + 0.2.2.23-alpha. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 720d14c..3b0d9dd 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1675,7 +1675,8 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, uint64_t v, mv; int i,ok,ok_m; - int have_maxima = (smartlist_len(s_values) == smartlist_len(s_maxima)); + int have_maxima = s_maxima && s_values && + (smartlist_len(s_values) == smartlist_len(s_maxima)); if (s_values && s_begins >= now - NUM_SECS_BW_SUM_INTERVAL*NUM_TOTALS) { start = s_begins - s_interval*(smartlist_len(s_values));

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 10 Sep '12

10 Sep '12

commit d85b563dbb0c57bc5731e664952ed3f8b9a8f6e8 Merge: 19b2126 8731a4e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 10 18:25:57 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6801 | 5 +++++ src/or/rephist.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/master] fold in another
by arma＠torproject.org 10 Sep '12

10 Sep '12

commit 77d17a360767d8a14ce42a1dd91a8c65973bb768 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 10 18:28:41 2012 -0400 fold in another --- ChangeLog | 3 +++ changes/bug6801 | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c296933..74183b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,9 @@ Changes in version 0.2.4.2-alpha - 2012-09-10 - Rename the (internal-use-only) UsingTestingNetworkDefaults option to start with a triple-underscore so the controller won't touch it. Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha. + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix + on 0.2.2.23-alpha. - Rename the (testing-use-only) _UseFilteringSSLBufferevents option so it doesn't start with _. Fixes bug 3155. Bugfix on 0.2.3.1-alpha. - Don't follow the NULL pointer if microdescriptor generation fails. diff --git a/changes/bug6801 b/changes/bug6801 deleted file mode 100644 index ef21acc..0000000 --- a/changes/bug6801 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid segfault when starting up having run with an extremely old - version of Tor and parsing its state file. Fixes bug 6801; bugfix on - 0.2.2.23-alpha. -

1 0

[tor/maint-0.2.3] Avoid segfault when reading state file from ancient tor
by nickm＠torproject.org 10 Sep '12

10 Sep '12

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2012