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

[tor/master] fold in new changes entries
by arma＠torproject.org 30 Apr '12

30 Apr '12

commit b8e6314cf69a894e9fcc8e5b0ce96efa185dc6d6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 30 16:14:20 2012 -0400 fold in new changes entries --- ChangeLog | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug2749 | 8 ------- changes/bug4438 | 6 ----- changes/bug4528 | 6 ----- changes/bug4572 | 6 ----- changes/bug5103 | 3 -- changes/bug5112 | 5 ---- changes/bug5434 | 3 -- changes/bug5537 | 5 ---- changes/bug5623 | 6 ----- changes/bug5704 | 4 --- changes/mingw-fixes | 5 ---- 12 files changed, 52 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index a89a01a..923e5d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +Changes in version 0.2.3.15-alpha - 2012-04-30 + Tor 0.2.3.15-alpha fixes a variety of smaller bugs, including making + the development branch build on Windows again. + + o Minor bugfixes (on 0.2.2.x and earlier): + - Make sure that there are no unhandled pending TLS errors before + reading from a TLS stream. We had checks in 0.1.0.3-rc, but + lost them in 0.1.0.5-rc when we refactored read_to_buf_tls(). + Bugfix on 0.1.0.5-rc; fixes bug 4528. + - Fix an assert that directory authorities could trigger on sighup + during some configuration state transitions. We now don't treat + it as a fatal error when the new descriptor we just generated in + init_keys() isn't accepted. Fixes bug 4438; bugfix on 0.2.1.9-alpha. + - After we pick a directory mirror, we would refuse to use it if + it's in our ExcludeExitNodes list, resulting in mysterious failures + to bootstrap for people who just wanted to avoid exiting from + certain locations. Fixes bug 5623; bugfix on 0.2.2.25-alpha. + - When building with --enable-static-tor on OpenBSD, do not + erroneously attempt to link -lrt. Fixes bug 5103. + + o Minor bugfixes (on 0.2.3.x): + - When Tor is built with kernel headers from a recent (last few + years) Linux kernel, do not fail to run on older (pre-2.6.28 + Linux kernels). Fixes bug 5112; bugfix on 0.2.3.1-alpha. + - Fix cross-compilation isssues with mingw. Bugfixes on 0.2.3.6-alpha + and 0.2.3.12-alpha. + - Fix compilation with miniupnpc version 1.6; patch from + Anthony G. Basile. Fixes bug 5434; bugfix on 0.2.3.12-alpha. + - Fix compilation with MSVC, which had defined MS_WINDOWS. Bugfix + on 0.2.3.13-alpha; found and fixed by Gisle Vanem. + - Fix compilation on platforms without unistd.h, or where environ + is defined in stdlib.h. Fixes bug 5704; bugfix on 0.2.3.13-alpha. + + o Minor features: + - Directory authorities are now a little more lenient at accepting + older router descriptors, or newer router descriptors that don't + make big changes. This should help ameliorate past and future + issues where routers think they have uploaded valid descriptors, + but the authorities don't think so. Fix for ticket 2479. + - Make the code that clients use to detect an address change be + IPv6-aware, so that it won't fill clients' logs with error + messages when trying to get the IPv4 address of an IPv6 + connection. Implements ticket 5537. + + o Removed features: + - Remove the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays option; + authorities needed to use it for a while to keep the network working + as people upgraded to 0.2.1.31, 0.2.2.34, or 0.2.3.6-alpha, but + that was six months ago. As of now, it should no longer be needed + or used. + + Changes in version 0.2.3.14-alpha - 2012-04-23 Tor 0.2.3.14-alpha fixes yet more bugs to get us closer to a release candidate. It also dramatically speeds up AES: fast relays should diff --git a/changes/bug2749 b/changes/bug2749 deleted file mode 100644 index 964a828..0000000 --- a/changes/bug2749 +++ /dev/null @@ -1,8 +0,0 @@ - o Changed parameters (authorities): - - Authorities are now a little more lenient at accepting older - router descriptors, or newer router descriptors that don't make - big changes. This should help ameliorate past and future issues - where routers think they have uploaded valid descriptors, but the - authorities don't think so. Fix for ticket 2479. - - diff --git a/changes/bug4438 b/changes/bug4438 deleted file mode 100644 index 94690e1..0000000 --- a/changes/bug4438 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Fix a dirauth-only exit on sighup that could happen during some - configuration state transitions. We now don't treat it as a fatal - error when the new descriptor we just generated in init_keys - isn't accepted. Fixes bug 4438; bugfix on 0.2.1.9-alpha. - diff --git a/changes/bug4528 b/changes/bug4528 deleted file mode 100644 index 8703d6a..0000000 --- a/changes/bug4528 +++ /dev/null @@ -1,6 +0,0 @@ - - o Minor bugfixes: - - Make sure that there are no unhandled pending TLS errors before - reading from a TLS stream. We had checks in 0.1.0.3-rc, but - lost them in 0.1.0.5-rc when we refactored read_to_buf_tls(). - Bugfix on 0.1.0.5-rc; fixes bug 4528. diff --git a/changes/bug4572 b/changes/bug4572 deleted file mode 100644 index 3107bf9..0000000 --- a/changes/bug4572 +++ /dev/null @@ -1,6 +0,0 @@ - o Removed features - - Remove the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays option; - authorities needed to use it for a while to keep the network working - as people upgraded to 0.2.1.31, 0.2.2.34, or 0.2.3.6-alpha, but that - was six months ago. As of now, it should no longer be needed or used. - diff --git a/changes/bug5103 b/changes/bug5103 deleted file mode 100644 index dbc462c..0000000 --- a/changes/bug5103 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (build): - - When building with --enable-static-tor on OpenBSD, do not - erroneously attempt to link -lrt. diff --git a/changes/bug5112 b/changes/bug5112 deleted file mode 100644 index 9607a92..0000000 --- a/changes/bug5112 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - When Tor is built with kernel headers from a recent (last few - years) Linux kernel, do not fail to run on older (pre-2.6.28 - Linux kernels). Fixes bug 5112; bugfix on 0.2.3.1-alpha. - diff --git a/changes/bug5434 b/changes/bug5434 deleted file mode 100644 index 31c02d7..0000000 --- a/changes/bug5434 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Fix compilation with miniupnpc version 1.6; patch from - Anthony G. Basile. Fixes bug 5434. diff --git a/changes/bug5537 b/changes/bug5537 deleted file mode 100644 index bcad2a2..0000000 --- a/changes/bug5537 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Make the code that clients use to detect an address change be - IPv6-aware, so that it won't fill clients' logs with error - messages when trying to get the IPv4 address of an IPv6 - connection. Implements ticket 5537. diff --git a/changes/bug5623 b/changes/bug5623 deleted file mode 100644 index 285a5b1..0000000 --- a/changes/bug5623 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - After we pick a directory mirror, we would refuse to use it if - it's in our ExcludeExitNodes list, resulting in mysterious failures - to bootstrap for people who just wanted to avoid exiting from - certain locations. Fixes bug 5623; bugfix on 0.2.2.25-alpha. - diff --git a/changes/bug5704 b/changes/bug5704 deleted file mode 100644 index 40afefb..0000000 --- a/changes/bug5704 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix compilation on platforms without unistd.h, or where environ - is defined in stdlib.h. Fixes bug 5704; bugfix on - 0.2.3.13-alpha. \ No newline at end of file diff --git a/changes/mingw-fixes b/changes/mingw-fixes deleted file mode 100644 index f8cac18..0000000 --- a/changes/mingw-fixes +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix cross-compilation isssues with mingw. Bugfixes on - 0.2.3.6-alpha and 0.2.3.12-alpha. - - Fix compilation with MSVC, which had defined MS_WINDOWS. Bugfix - on 0.2.3.13-alpha; found and fixed by Gisle Vanem. \ No newline at end of file

1 0

[tor/master] Remove __ from HAVE_EXTERN_ENVIRON_DECLARED__
by arma＠torproject.org 30 Apr '12

30 Apr '12

commit c03a233faae20d1766fb8f249cccb130b29891d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 30 12:52:16 2012 -0400 Remove __ from HAVE_EXTERN_ENVIRON_DECLARED__ I think that the trailing __ got added in false analogy to HAVE_MACRO__func__, HAVE_MACRO__FUNC__, and HAVE_MACRO__FUNCTION__. But those macros actually indicate the presence of __func__, __FUNC__, and __FUNCTION__ respectively. The __ at the end of HAVE_EXTERN_ENVIRON_DECLARED would only be appropriate if the environ were declared__, whatever that means. (As a side-note, HAVE_MACRO__func__ and so on should probably be renamed HAVE_MACRO___func__ and so on. But that can wait.) This is an identifier renaming only. --- configure.in | 2 +- src/common/compat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index d4ea6c6..ede2087 100644 --- a/configure.in +++ b/configure.in @@ -1138,7 +1138,7 @@ if test "$tor_cv_have_FUNCTION_macro" = 'yes'; then fi if test "$tor_cv_have_environ_declared" = 'yes'; then - AC_DEFINE(HAVE_EXTERN_ENVIRON_DECLARED__, 1, + AC_DEFINE(HAVE_EXTERN_ENVIRON_DECLARED, 1, [Defined if we have extern char **environ already declared]) fi diff --git a/src/common/compat.c b/src/common/compat.c index 0e8d144..fbb37ce 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1712,7 +1712,7 @@ make_path_absolute(char *fname) } #ifndef HAVE__NSGETENVIRON -#ifndef HAVE_EXTERN_ENVIRON_DECLARED__ +#ifndef HAVE_EXTERN_ENVIRON_DECLARED /* Some platforms declare environ under some circumstances, others don't. */ extern char **environ; #endif

1 0

[tor/master] Fix headers in test for whether environ is declared in stdlib/unistd
by arma＠torproject.org 30 Apr '12

30 Apr '12

commit 6156403237fc1775a55000af5b792a5bb1b6e0f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 30 12:48:33 2012 -0400 Fix headers in test for whether environ is declared in stdlib/unistd We'd had our configure.in test include unistd.h unconditionally, which would fail on Windows/mingw, even though environ _was_ declared there. Fix for 5704; bugfix on 0.2.3.13-alpha. Thanks to Erinn for finding this and rransom for figuring out the problem. --- changes/bug5704 | 4 ++++ configure.in | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug5704 b/changes/bug5704 new file mode 100644 index 0000000..40afefb --- /dev/null +++ b/changes/bug5704 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix compilation on platforms without unistd.h, or where environ + is defined in stdlib.h. Fixes bug 5704; bugfix on + 0.2.3.13-alpha. \ No newline at end of file diff --git a/configure.in b/configure.in index e6f379c..d4ea6c6 100644 --- a/configure.in +++ b/configure.in @@ -1116,7 +1116,10 @@ AC_CACHE_CHECK([whether we have extern char **environ already declared], /* We define _GNU_SOURCE here because it is also defined in compat.c. * Without it environ doesn't get declared. */ #define _GNU_SOURCE +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#include <stdlib.h> int main(int c, char **v) { char **t = environ; }])], tor_cv_have_environ_declared=yes, tor_cv_have_environ_declared=no))

1 0

[torbrowser/master] OSX: Fix Firefox build to not crash
by erinn＠torproject.org 30 Apr '12

30 Apr '12

commit 1b56e945bbd5a772f895dd9d3a818f2e606a430d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 30 18:27:44 2012 +0200 OSX: Fix Firefox build to not crash --- build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 6ec8d67..e428a7a 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -6,8 +6,8 @@ mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8" # Options for cross-compilation on Snow Leopard. -HOST_CC="gcc -arch i386" -HOST_CXX="g++ -arch i386" +HOST_CC="clang -arch i386" +HOST_CXX="clang++ -arch i386" CC="gcc -arch i386" CXX="g++ -arch i386" RANLIB=ranlib @@ -28,3 +28,6 @@ ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-crashreporter + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type" diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index d4857b6..b0d1a52 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig -CC="gcc -arch x86_64" -CXX="g++ -arch x86_64" +CC="clang -arch x86_64" +CXX="clang++ -arch x86_64" HOST_CC="gcc" HOST_CXX="g++" RANLIB=ranlib @@ -19,7 +19,7 @@ mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk -ac_add_options --target=x86_64-apple-darwin10.7.0 +ac_add_options --target=x86_64-apple-darwin10.6.0 ac_add_options --enable-macos-target=10.6 # bug 491774. crashreporter won't build in cross compile ac_add_options --disable-crashreporter @@ -30,3 +30,6 @@ ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type"

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 30 Apr '12

30 Apr '12

commit 65201446b38f4aa5e0a403333d1ff86c67ad0bed Merge: 6e9b75b 1b56e94 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 30 15:19:37 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.3] OSX: Fix Firefox build to not crash
by erinn＠torproject.org 30 Apr '12

30 Apr '12

commit 1b56e945bbd5a772f895dd9d3a818f2e606a430d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 30 18:27:44 2012 +0200 OSX: Fix Firefox build to not crash --- build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 6ec8d67..e428a7a 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -6,8 +6,8 @@ mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8" # Options for cross-compilation on Snow Leopard. -HOST_CC="gcc -arch i386" -HOST_CXX="g++ -arch i386" +HOST_CC="clang -arch i386" +HOST_CXX="clang++ -arch i386" CC="gcc -arch i386" CXX="g++ -arch i386" RANLIB=ranlib @@ -28,3 +28,6 @@ ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-crashreporter + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type" diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index d4857b6..b0d1a52 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig -CC="gcc -arch x86_64" -CXX="g++ -arch x86_64" +CC="clang -arch x86_64" +CXX="clang++ -arch x86_64" HOST_CC="gcc" HOST_CXX="g++" RANLIB=ranlib @@ -19,7 +19,7 @@ mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk -ac_add_options --target=x86_64-apple-darwin10.7.0 +ac_add_options --target=x86_64-apple-darwin10.6.0 ac_add_options --enable-macos-target=10.6 # bug 491774. crashreporter won't build in cross compile ac_add_options --disable-crashreporter @@ -30,3 +30,6 @@ ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type"

1 0

[torbrowser/maint-2.2] OSX: Fix Firefox build to not crash
by erinn＠torproject.org 30 Apr '12

30 Apr '12

commit 1b56e945bbd5a772f895dd9d3a818f2e606a430d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Apr 30 18:27:44 2012 +0200 OSX: Fix Firefox build to not crash --- build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 6ec8d67..e428a7a 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -6,8 +6,8 @@ mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j8" # Options for cross-compilation on Snow Leopard. -HOST_CC="gcc -arch i386" -HOST_CXX="g++ -arch i386" +HOST_CC="clang -arch i386" +HOST_CXX="clang++ -arch i386" CC="gcc -arch i386" CXX="g++ -arch i386" RANLIB=ranlib @@ -28,3 +28,6 @@ ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-crashreporter + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type" diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index d4857b6..b0d1a52 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig -CC="gcc -arch x86_64" -CXX="g++ -arch x86_64" +CC="clang -arch x86_64" +CXX="clang++ -arch x86_64" HOST_CC="gcc" HOST_CXX="g++" RANLIB=ranlib @@ -19,7 +19,7 @@ mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk -ac_add_options --target=x86_64-apple-darwin10.7.0 +ac_add_options --target=x86_64-apple-darwin10.6.0 ac_add_options --enable-macos-target=10.6 # bug 491774. crashreporter won't build in cross compile ac_add_options --disable-crashreporter @@ -30,3 +30,6 @@ ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug + +export CFLAGS="-Wno-return-type" +export CXXFLAGS="-Wno-return-type"

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 30 Apr '12

30 Apr '12

commit 65201446b38f4aa5e0a403333d1ff86c67ad0bed Merge: 6e9b75b 1b56e94 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Apr 30 15:19:37 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/mozconfig-osx-i386 | 7 +++++-- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 30 Apr '12

30 Apr '12

commit 7917c3b16d6ecb4df90b5890571445b6bf86c3cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 30 17:15:12 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 96 +++++++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 48 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index ba59f2d..666b4b3 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-25 08:18+0000\n" +"PO-Revision-Date: 2012-04-30 17:06+0000\n" "Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1178,7 +1178,7 @@ msgstr "ایالات متحده" msgctxt "CountryInfo" msgid "Uruguay" -msgstr "" +msgstr "اروگوئه" msgctxt "CountryInfo" msgid "Uzbekistan" @@ -1250,7 +1250,7 @@ msgstr "فیجی" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "فنلاند" msgctxt "CountryInfo" msgid "Greece" @@ -1874,7 +1874,7 @@ msgstr "" msgctxt "MainWindow" msgid "Tor Update Available" -msgstr "" +msgstr "به روز رسانی برای تور موجود است" msgctxt "MainWindow" msgid "" @@ -1884,7 +1884,7 @@ msgstr "" msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "" +msgstr "وب سایت تور: %1" msgctxt "MainWindow" msgid "" @@ -1894,7 +1894,7 @@ msgstr "" msgctxt "MainWindow" msgid "Failed to Create New Identity" -msgstr "" +msgstr "ایجاد هویت جدید به شکست انجامید" msgctxt "MainWindow" msgid "Port Forwarding Failed" @@ -1906,15 +1906,15 @@ msgstr "" msgctxt "MainWindow" msgid "Vidalia Control Panel" -msgstr "" +msgstr "تابلوی کنترل ویدالیا" msgctxt "MainWindow" msgid "Status" -msgstr "" +msgstr "وضعیت" msgctxt "MainWindow" msgid "Password Reset Failed" -msgstr "" +msgstr "بازيابي كلمه عبور شكست خورد" msgctxt "MainWindow" msgid "" @@ -1939,29 +1939,29 @@ msgstr "" msgctxt "MainWindow" msgid "Update Failed" -msgstr "" +msgstr "بروز رسانی ناموفق" msgctxt "MainWindow" msgid "Your software is up to date" -msgstr "" +msgstr "نرم افزار شما به روز است." msgctxt "MainWindow" msgid "" "There are no new Tor software packages available for your computer at this " "time." -msgstr "" +msgstr "در حال حاضر نسخه اي از تُر براي كامپيوتر شما وجود ندارد." msgctxt "MainWindow" msgid "Installation Failed" -msgstr "" +msgstr "نصب ناموفق بود" msgctxt "MainWindow" msgid "Vidalia was unable to install your software updates." -msgstr "" +msgstr "ویدالیا در نصب بروز رسانی نرم افزار شما ناموفق بود" msgctxt "MainWindow" msgid "The following error occurred:" -msgstr "" +msgstr "خطا هاي زير رخ داد:" msgctxt "MainWindow" msgid "" @@ -1972,15 +1972,15 @@ msgstr "" msgctxt "MainWindow" msgid "toolBar" -msgstr "" +msgstr "نوار ابزار" msgctxt "MainWindow" msgid "Restart" -msgstr "" +msgstr "شروع دوباره" msgctxt "MainWindow" msgid "Reload Tor's config" -msgstr "" +msgstr "بار گزاری مجدد پیکربندی تور" msgctxt "MainWindow" msgid "Actions" @@ -1998,11 +1998,11 @@ msgstr "" msgctxt "MainWindow" msgid "Error reloading configuration" -msgstr "" +msgstr "خطای بار گزاری مجدد پیکر بندی" msgctxt "MainWindow" msgid "Vidalia was unable to reload Tor's configuration." -msgstr "" +msgstr "ویدالیا در بار گزاری مجدد پیکر بندی تور ناتوان بود" msgctxt "MainWindow" msgid "No dettached tabs" @@ -2079,7 +2079,7 @@ msgstr "" msgctxt "MainWindow" msgid "failed (%1)" -msgstr "" +msgstr "ناموفق(%1)" msgctxt "MainWindow" msgid "(probably Telnet)" @@ -2107,11 +2107,11 @@ msgstr "" msgctxt "MessageLog" msgid "Vidalia was unable to register for Tor's log events." -msgstr "" +msgstr "ویدالیا نتوانست برای دریافت گزارشات تُر ثبت‌نام کند" msgctxt "MessageLog" msgid "Error Opening Log File" -msgstr "" +msgstr "خطا در بازکردن فایل گزارش" msgctxt "MessageLog" msgid "Vidalia was unable to open the specified log file." @@ -2119,7 +2119,7 @@ msgstr "" msgctxt "MessageLog" msgid "Log Filename Required" -msgstr "" +msgstr "نام فایل گزارش الزامی است" msgctxt "MessageLog" msgid "You must enter a filename to be able to save log messages to a file." @@ -2127,31 +2127,31 @@ msgstr "" msgctxt "MessageLog" msgid "Select Log File" -msgstr "" +msgstr "فایل گزارش را انتخاب کن" msgctxt "MessageLog" msgid "Save Log Messages" -msgstr "" +msgstr "پیام‌های گزارش را ذخیره کن" msgctxt "MessageLog" msgid "Text Files (*.txt)" -msgstr "" +msgstr "فایل‌های متنی (*.txt)" msgctxt "MessageLog" msgid "Vidalia" -msgstr "" +msgstr "ویدالیا" msgctxt "MessageLog" msgid "Find in Message Log" -msgstr "" +msgstr "جستجو در گزارش پیام‌ها" msgctxt "MessageLog" msgid "Find:" -msgstr "" +msgstr "پیدا کن" msgctxt "MessageLog" msgid "Not Found" -msgstr "" +msgstr "پیدا نشد" msgctxt "MessageLog" msgid "Search found 0 matches." @@ -2159,71 +2159,71 @@ msgstr "" msgctxt "MessageLog" msgid "Message Log" -msgstr "" +msgstr "گزارش پیام‌ها" msgctxt "MessageLog" msgid "Message Filters..." -msgstr "" +msgstr "فیلترهای پیام ..." msgctxt "MessageLog" msgid "Set message filters" -msgstr "" +msgstr "تنظیم فیلترهای پیام" msgctxt "MessageLog" msgid "History Size..." -msgstr "" +msgstr "اندازه‌ی تاریخچه ..." msgctxt "MessageLog" msgid "Set maximum number of messages to display" -msgstr "" +msgstr "تعیین حداکثر تعداد پیام‌های قابل نمایش" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "پاک کن" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" -msgstr "" +msgstr "تمام پیام‌های گزارش را پاک کن (کنترل + E)" msgctxt "MessageLog" msgid "Ctrl+E" -msgstr "" +msgstr "کنترل + E" msgctxt "MessageLog" msgid "Copy" -msgstr "" +msgstr "کپی کن" msgctxt "MessageLog" msgid "Copy the selected messages to the clipboard (Ctrl+C)" -msgstr "" +msgstr "پیام‌های انتخاب شده را به دفترچه یادداشت رایانه کپی کن" msgctxt "MessageLog" msgid "Ctrl+C" -msgstr "" +msgstr "کنترل + C" msgctxt "MessageLog" msgid "Select All" -msgstr "" +msgstr "همه را انتخاب کن" msgctxt "MessageLog" msgid "Select all messages (Ctrl+A)" -msgstr "" +msgstr "تمام پیام‌ها را انتخاب کن (کنترل + A)" msgctxt "MessageLog" msgid "Ctrl+A" -msgstr "" +msgstr "کنترل + A" msgctxt "MessageLog" msgid "Save All" -msgstr "" +msgstr "همه را ذخیره کن" msgctxt "MessageLog" msgid "Save all messages to a file" -msgstr "" +msgstr "تمام پیام‌ها را در یک فایل ذخیره کن" msgctxt "MessageLog" msgid "Save Selected" -msgstr "" +msgstr "انتخاب شده‌ها را ذخیره کن" msgctxt "MessageLog" msgid "Save selected messages to a file"

1 0

[ooni-probe/master] Fix bug in test
by art＠torproject.org 30 Apr '12

30 Apr '12

commit b66810c4c6e139da2bb09df8c225a1d1f7e5e6bd Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Apr 11 02:07:31 2012 -0700 Fix bug in test --- plugoo/tests.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugoo/tests.py b/plugoo/tests.py index f94ba04..84a41b4 100644 --- a/plugoo/tests.py +++ b/plugoo/tests.py @@ -78,7 +78,7 @@ class Test: if assets: self.logger.debug("Running through tests") - if extradata and extradata['index']: + if extradata and 'index' in extradata: index = extradata['index'] else: index = None

1 0