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

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Jun '12

27 Jun '12

commit c1e63ae117c30871490b60d966874c9a8d4609ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 12:15:06 2012 +0000 Update translations for orbot --- values-hu/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 64112cb..68f3339 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -121,7 +121,7 @@ <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_title">Kimenő hálózati proxy</string> <string name="pref_proxy_type_title">Proxy típus</string> <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Adja meg a Proxy típust</string>

1 0

[metrics-web/master] Fix missing values in relay flags graph.
by karsten＠torproject.org 27 Jun '12

27 Jun '12

commit d759a27b986bc64e98720d74082c38a2e635df11 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 27 11:45:28 2012 +0200 Fix missing values in relay flags graph. --- rserve/graphs.R | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 41dd22b..0331750 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -608,6 +608,15 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), value = rep(NA, 5)), networksize) + dates <- seq(from = as.Date(start, "%Y-%m-%d"), + to = as.Date(end, "%Y-%m-%d"), by="1 day") + missing <- setdiff(dates, networksize$date) + if (length(missing) > 0) + networksize <- rbind(data.frame( + date = as.Date(rep(missing, 5), origin = "1970-01-01"), + variable = paste("avg_", c("running", "exit", "guard", "fast", + "stable"), sep = ""), + value = rep(NA, length(missing) * 5)), networksize) date_breaks <- date_breaks( as.numeric(max(as.Date(networksize$date, "%Y-%m-%d")) - min(as.Date(networksize$date, "%Y-%m-%d"))))

1 0

[vidalia/alpha] Fix segmentation fault when trying to close an already closed circuit
by chiiph＠torproject.org 26 Jun '12

26 Jun '12

commit 4c6cf86d215b9a2cd0cbfed7d9769ec8724e5483 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jun 26 20:07:03 2012 -0300 Fix segmentation fault when trying to close an already closed circuit --- changes/bug6243 | 3 +++ src/vidalia/network/CircuitListWidget.cpp | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/bug6243 b/changes/bug6243 new file mode 100644 index 0000000..2b51ca5 --- /dev/null +++ b/changes/bug6243 @@ -0,0 +1,3 @@ + Bugfixes relative to Vidalia 0.3.x: + o Fix segmentation fault when trying to close an already closed circuit in + the Network Map. Fixes bug 6243. diff --git a/src/vidalia/network/CircuitListWidget.cpp b/src/vidalia/network/CircuitListWidget.cpp index 3871503..4773d9b 100644 --- a/src/vidalia/network/CircuitListWidget.cpp +++ b/src/vidalia/network/CircuitListWidget.cpp @@ -79,8 +79,11 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos) if (!item->parent()) { /* A circuit was selected */ CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(item); - if (!circuitItem) + if (!circuitItem and + ((circuitItem->circuit().status() == Circuit::Closed) or + (circuitItem->circuit().status() == Circuit::Failed))) return; + CircuitId id = circuitItem->id(); /* Set up the circuit context menu */ QAction *zoomAct = new QAction(QIcon(IMG_ZOOM), @@ -98,14 +101,15 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos) * selected */ QAction* action = menu.exec(mapToGlobal(pos)); if (action == closeAct) - emit closeCircuit(circuitItem->id()); + emit closeCircuit(id); else if (action == zoomAct) - emit zoomToCircuit(circuitItem->id()); + emit zoomToCircuit(id); } else { /* A stream was selected */ StreamItem *streamItem = dynamic_cast<StreamItem *>(item); if (!streamItem) return; + StreamId id = streamItem->id(); /* Set up the stream context menu */ QAction *closeAct = new QAction(QIcon(IMG_CLOSE), @@ -116,7 +120,7 @@ CircuitListWidget::customContextMenuRequested(const QPoint &pos) * selected */ QAction* action = menu.exec(mapToGlobal(pos)); if (action == closeAct) - emit closeStream(streamItem->id()); + emit closeStream(id); } }

1 0

[tor/master] Bump the test util/threads timeout up to 150 sec
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 4645f28c3b125f9d281eb457d110c431a6a0b166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 13:44:34 2012 -0400 Bump the test util/threads timeout up to 150 sec This should make some debian build systems happier. Also, increase the select() timeout to a more reasonable 100 msec. --- changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6227 b/changes/bug6227 new file mode 100644 index 0000000..77b06ac --- /dev/null +++ b/changes/bug6227 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..9b9fccf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex);

1 0

[tor/master] Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 6330d2d9e6dc8cdeceea9486ad96e57487d6d232 Merge: 5fad3dc 4645f28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:03:56 2012 -0400 Merge remote-tracking branch 'public/bug6227' into maint-0.2.3 changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 86197dfd4f8a72698bdfa40b84cdb8787f6f94ce Merge: 05dd0a9 6330d2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:04:43 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Bump the test util/threads timeout up to 150 sec
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 4645f28c3b125f9d281eb457d110c431a6a0b166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 13:44:34 2012 -0400 Bump the test util/threads timeout up to 150 sec This should make some debian build systems happier. Also, increase the select() timeout to a more reasonable 100 msec. --- changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6227 b/changes/bug6227 new file mode 100644 index 0000000..77b06ac --- /dev/null +++ b/changes/bug6227 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..9b9fccf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex);

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6227' into maint-0.2.3
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 6330d2d9e6dc8cdeceea9486ad96e57487d6d232 Merge: 5fad3dc 4645f28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 11:03:56 2012 -0400 Merge remote-tracking branch 'public/bug6227' into maint-0.2.3 changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix a compilation warning with clang 3.0
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 201b852c277bdf4bf70a656871d502318bd5b25b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:48:31 2012 -0400 Fix a compilation warning with clang 3.0 In b1ad1a1d0266a20bb we introduced an implicit (but safe) long-to-int shortening that clang didn't like. Warning not in any released version of Tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index e5b51b9..d94dcf2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3347,7 +3347,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, *cur++ = '\n'; *cur++ = '\0'; - res = cur - hex_errno - 1; + res = (int)(cur - hex_errno - 1); goto done;

1 0

[tor/master] Add a unit test for environment_variable_names_equal
by nickm＠torproject.org 26 Jun '12

26 Jun '12

commit 9c8ec0aa20cda1787ee27a96e666af84f1081f5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:50:37 2012 -0400 Add a unit test for environment_variable_names_equal I need this because I'm about to frob that function to stop using strcspn() in order to get rid of a clang warning. --- changes/envvar_test | 2 ++ src/test/test_util.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/changes/envvar_test b/changes/envvar_test new file mode 100644 index 0000000..d76a817 --- /dev/null +++ b/changes/envvar_test @@ -0,0 +1,2 @@ + o New unit tests: + - Add a unit test for the environment_variable_names_equal function. \ No newline at end of file diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..d2d0a55 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2869,6 +2869,39 @@ test_util_sl_new_from_text_lines(void *ptr) } } +static void +test_util_envnames(void *ptr) +{ + (void) ptr; + + tt_assert(environment_variable_names_equal("abc", "abc")); + tt_assert(environment_variable_names_equal("abc", "abc=")); + tt_assert(environment_variable_names_equal("abc", "abc=def")); + tt_assert(environment_variable_names_equal("abc=def", "abc")); + tt_assert(environment_variable_names_equal("abc=def", "abc=ghi")); + + tt_assert(environment_variable_names_equal("abc", "abc")); + tt_assert(environment_variable_names_equal("abc", "abc=")); + tt_assert(environment_variable_names_equal("abc", "abc=def")); + tt_assert(environment_variable_names_equal("abc=def", "abc")); + tt_assert(environment_variable_names_equal("abc=def", "abc=ghi")); + + tt_assert(!environment_variable_names_equal("abc", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "abcd")); + tt_assert(!environment_variable_names_equal("abc=", "def")); + tt_assert(!environment_variable_names_equal("abc=", "def=")); + tt_assert(!environment_variable_names_equal("abc=x", "def=x")); + + tt_assert(!environment_variable_names_equal("", "a=def")); + /* A bit surprising. */ + tt_assert(environment_variable_names_equal("", "=def")); + tt_assert(environment_variable_names_equal("=y", "=x")); + + done: + ; +} + /** Test process_environment_make */ static void test_util_make_environment(void *ptr) @@ -3081,6 +3114,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(n_bits_set, 0), UTIL_TEST(eat_whitespace, 0), UTIL_TEST(sl_new_from_text_lines, 0), + UTIL_TEST(envnames, 0), UTIL_TEST(make_environment, 0), UTIL_TEST(set_env_var_in_sl, 0), END_OF_TESTCASES

1 0