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

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 06 Apr '15

06 Apr '15

commit ea2ab8eb774ad1f38e2cf44762abd2e9f30a2ffc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 6 23:15:06 2015 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 7e2d4d7..55be4b5 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-04-06 22:44+0000\n" +"PO-Revision-Date: 2015-04-06 22:51+0000\n" "Last-Translator: debo debo <a.adeebo(a)yahoo.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "اختر الكل" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "اظهار QRCODE" +msgstr "اظهار ال QRكود" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" @@ -306,7 +306,7 @@ msgstr "للأسف لم يتم العثور علي ما طلبت" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "يبدو أن هناك خطأ في الحصول على QRCODE الخاص بك." +msgstr "يبدو أن هناك خطأ في الحصول على الQRكود الخاص بك." #: lib/bridgedb/templates/bridges.html:121 msgid ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Apr '15

06 Apr '15

commit c1ba172285f2cef32a20cafd10fcbd70fb2b5b3b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 6 23:15:02 2015 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 7e2d4d7..55be4b5 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-04-06 22:44+0000\n" +"PO-Revision-Date: 2015-04-06 22:51+0000\n" "Last-Translator: debo debo <a.adeebo(a)yahoo.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "اختر الكل" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "اظهار QRCODE" +msgstr "اظهار ال QRكود" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" @@ -306,7 +306,7 @@ msgstr "للأسف لم يتم العثور علي ما طلبت" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "يبدو أن هناك خطأ في الحصول على QRCODE الخاص بك." +msgstr "يبدو أن هناك خطأ في الحصول على الQRكود الخاص بك." #: lib/bridgedb/templates/bridges.html:121 msgid ""

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 06 Apr '15

06 Apr '15

commit 89216f4619cecf7ed9ebf32e0d652f59dd40562c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 6 22:45:08 2015 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 57 +++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 03d4a5e..7e2d4d7 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -1,14 +1,16 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2014 # allamiro <allamiro(a)gmail.com>, 2011 # Ash <ali.shatrieh(a)gmail.com>, 2014 +# debo debo <a.adeebo(a)yahoo.com>, 2015 # Mohamed El-Feky <elfeky.m(a)gmail.com>, 2014 # AnonymousLady <farah.jaza(a)hotmail.com>, 2014 # 0xidz <ghoucine(a)gmail.com>, 2014 +# KACIMI LAMINE <k_lamine27(a)yahoo.fr>, 2015 # محمد الحرقان <malham1(a)gmail.com>, 2011 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 @@ -19,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-11-20 07:20+0000\n" -"Last-Translator: Ash <ali.shatrieh(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-04-06 22:44+0000\n" +"Last-Translator: debo debo <a.adeebo(a)yahoo.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +43,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "عذراً! حدث خطأ في طلبك." @@ -84,7 +86,7 @@ msgstr "مرحبا، %s " msgid "Hello, friend!" msgstr "مرحبا ,صديقي!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "مفاتيح عامة" @@ -153,7 +155,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني مع استعمال إحدى العناوين البريدية التالية: %s أو %s أو %s." +msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني من احدى العناوين البريدية التالية: %s أو %s أو %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -265,35 +267,58 @@ msgstr "أطلب Pluggable Transport بـ TYPE" msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "احصل على نسخة من مفتاح GnuPG العام الخاص بـBridgeDB" -#: lib/bridgedb/templates/base.html:92 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "ابلغ عن خطأ بالبرنامج" -#: lib/bridgedb/templates/base.html:94 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "كود البرنامج" -#: lib/bridgedb/templates/base.html:97 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "التغييرات" -#: lib/bridgedb/templates/base.html:99 +#: lib/bridgedb/templates/base.html:98 msgid "Contact" msgstr "اتصل بنا" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "اختر الكل" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "اظهار QRCODE" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "كود الQR التابع لخطوط جسرك" + #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "للأسف لم يتم العثور علي ما طلبت" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "يبدو أن هناك خطأ في الحصول على QRCODE الخاص بك." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "الQRكود هذا يحتوي على خطوط جسرك .امسح هذا الكود بقارئ الQR لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "لا يوجد أي bridges متاحة حاليا" -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -354,7 +379,7 @@ msgstr "لا شيء" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sن%sعم!" @@ -362,7 +387,7 @@ msgstr "%sن%sعم!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sأ%sصل علي Bridges"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Apr '15

06 Apr '15

commit 31119572ab5993dbd4bc73c4e8af4038a2cefbbb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 6 22:45:04 2015 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 3dd6492..7e2d4d7 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -6,6 +6,7 @@ # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2014 # allamiro <allamiro(a)gmail.com>, 2011 # Ash <ali.shatrieh(a)gmail.com>, 2014 +# debo debo <a.adeebo(a)yahoo.com>, 2015 # Mohamed El-Feky <elfeky.m(a)gmail.com>, 2014 # AnonymousLady <farah.jaza(a)hotmail.com>, 2014 # 0xidz <ghoucine(a)gmail.com>, 2014 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-04 13:51+0000\n" -"Last-Translator: KACIMI LAMINE <k_lamine27(a)yahoo.fr>\n" +"PO-Revision-Date: 2015-04-06 22:44+0000\n" +"Last-Translator: debo debo <a.adeebo(a)yahoo.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +155,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني مع استعمال إحدى العناوين البريدية التالية: %s أو %s أو %s." +msgstr "طريقة أخرى للحصول على جسور عبر إرسال بريد إلكتروني إلى %s. يرجى ملاحظة أنّه يجب ارسال البريد الإلكتروني من احدى العناوين البريدية التالية: %s أو %s أو %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -292,7 +293,7 @@ msgstr "اظهار QRCODE" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "كود الQR التابع لخطوط جسرك" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -311,7 +312,7 @@ msgstr "يبدو أن هناك خطأ في الحصول على QRCODE الخاص msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "الQRكود هذا يحتوي على خطوط جسرك .امسح هذا الكود بقارئ الQR لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..."

1 0

[tor/master] Fix the memory leak in `warn_if_option_path_is_relative()`.
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit 79544a6fc5342605a23773ba7d6fc2d863f1dd76 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Apr 6 17:53:01 2015 +0000 Fix the memory leak in `warn_if_option_path_is_relative()`. Fixes coverity defect CID 1293337, not in any released version of tor. --- src/or/config.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d65d35d..00de0b9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2558,10 +2558,12 @@ static void warn_if_option_path_is_relative(const char *option, char *filepath) { - if (filepath &&path_is_relative(filepath)) + if (filepath && path_is_relative(filepath)) { + char *abs_path = make_path_absolute(filepath); COMPLAIN("Path for %s (%s) is relative and will resolve to %s." - " Is this what you wanted?",option,filepath, - make_path_absolute(filepath)); + " Is this what you wanted?", option, filepath, abs_path); + tor_free(abs_path); + } } /** Scan options for occurances of relative file/directory

1 0

[webwml/master] revise the wau holland account info, as recommended by julius
by arma＠torproject.org 06 Apr '15

06 Apr '15

commit 0d922aa7bfec915a1a3870f09b8452b693d0a267 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 6 13:35:16 2015 -0400 revise the wau holland account info, as recommended by julius --- donate/en/donate.wml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 64a131e..b11cfd9 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -259,13 +259,11 @@ href="https://www.dwolla.com/hub/thetorproject">Continue to Dwolla <a href="http://www.ccc.de/">CCC in Germany</a> to provide tax-deductible donations for Europeans: Wau Holland Stiftung - IBAN DE03 5204 0021 0277 281202 - SWIFT BIC COBADEFF520 - <h4>Classic style German account information is:</h4> - Konto: 2772812-02 - Inhaber: Wau Holland Stiftung - Bank: Commerzbank Kassel - BLZ: 52040021 + Commerzbank Kassel + BLZ: 52040021 + Konto: 2772812-02 + IBAN: DE03 5204 0021 0277 2812 02 + BIC: COBADEFF520 *or* COBADEFFXXX <ul> <li>Residents from any of the 31 <a href="http://en.wikipedia.org/wiki/Single_Euro_Payments_Area">SEPA</a>

1 0

[meek/master] Replace --exit-on-stdin-eof with TOR_PT_EXIT_ON_STDIN_CLOSE=1.
by dcf＠torproject.org 06 Apr '15

06 Apr '15

commit e2f3c4e3052b6089d11cb12cc8c31aab1cd2728a Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 5 16:22:36 2015 -0700 Replace --exit-on-stdin-eof with TOR_PT_EXIT_ON_STDIN_CLOSE=1. There's now an official way for tor to request this behavior. --- meek-client-torbrowser/meek-client-torbrowser.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 0c339af..65c3b46 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -18,14 +18,6 @@ // This program proxies stdin and stdout to and from meek-client, so it is // actually meek-client that drives the pluggable transport negotiation with // tor. -// -// The special --exit-on-stdin-eof is a special workaround for Windows. On -// Windows we don't get a detectable shutdown signal that allows us to kill the -// subprocesses we've started. Instead, use the --exit-on-stdin-eof option and -// run this program inside of terminateprocess-buffer. When -// terminateprocess-buffer is killed, it will close our stdin, and we can exit -// gracefully. --exit-on-stdin-eof and terminateprocess-buffer need to be used -// together. package main import ( @@ -138,12 +130,10 @@ func runMeekClient(helperAddr string, meekClientCommandLine []string) (cmd *exec } func main() { - var exitOnStdinEOF bool var logFilename string var err error flag.Usage = usage - flag.BoolVar(&exitOnStdinEOF, "exit-on-stdin-eof", false, "exit when stdin is closed (use with terminateprocess-buffer)") flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse() @@ -182,13 +172,10 @@ func main() { } defer logKill(meekClientCmd.Process) - if exitOnStdinEOF { - // On Windows, we don't get a SIGINT or SIGTERM, rather we are - // killed without a chance to clean up our subprocesses. When - // run inside terminateprocess-buffer, it is instead - // terminateprocess-buffer that is killed, and we can detect - // that event by that our stdin gets closed. - // https://trac.torproject.org/projects/tor/ticket/9330 + if os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" { + // This environment variable means we should treat EOF on stdin + // just like SIGTERM. + // https://trac.torproject.org/projects/tor/ticket/15435 go func() { io.Copy(ioutil.Discard, os.Stdin) log.Printf("synthesizing SIGTERM because of stdin close")

1 0

[meek/master] Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 in terminateprocess-buffer.
by dcf＠torproject.org 06 Apr '15

06 Apr '15

commit 1fa2da7c6c03500ee899061a773fb7cfb0c1bf5f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 5 16:17:49 2015 -0700 Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 in terminateprocess-buffer. Since #15435, we can treat terminateprocess-buffer as a compatibility shim that adds support for TOR_PT_EXIT_ON_STDIN_CLOSE to versions of tor that don't have it. --- terminateprocess-buffer/terminateprocess-buffer.go | 28 ++++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/terminateprocess-buffer/terminateprocess-buffer.go b/terminateprocess-buffer/terminateprocess-buffer.go index f826159..ef6f353 100644 --- a/terminateprocess-buffer/terminateprocess-buffer.go +++ b/terminateprocess-buffer/terminateprocess-buffer.go @@ -1,11 +1,18 @@ -// The terminateprocess-buffer program is designed to act as a -// TerminateProcess-absorbing buffer between tor and a transport plugin on -// Windows. On Windows, transport plugins are killed with a TerminateProcess, -// which doesn't give them a chance to clean up before exiting. -// https://trac.torproject.org/projects/tor/ticket/9330 -// The idea of this program is that the transport plugin can read from its -// standard input, which will be closed when this program is terminated. The -// transport plugin can then treat the stdin-closed event like a SIGTERM. +// This program simulates support for TOR_PT_EXIT_ON_STDIN_CLOSE for versions of +// tor without it. It sets TOR_PT_EXIT_ON_STDIN_CLOSE=1, then sits between tor +// and a transport plugin and keeps the plugin's stdin open. (Versions of tor +// that do not support TOR_PT_EXIT_ON_STDIN_CLOSE instead close the plugin's +// stdin immediately.) +// +// This is mainly useful on Windows, where, before TOR_PT_EXIT_ON_STDIN_CLOSE, +// tor kills child processes with TerminateProcess, which doesn't give them a +// chance to clean up. When you put this program in between tor and the plugin, +// it is this program that is killed (and has its stdout closed) by +// TerminateProcess. The plugin can then obey TOR_PT_EXIT_ON_STDIN_CLOSE=1, +// notice that its stdin has closed, and exit gracefully. +// +// TOR_PT_EXIT_ON_STDIN_CLOSE: +// https://trac.torproject.org/projects/tor/ticket/15435 package main import ( @@ -20,6 +27,10 @@ func main() { if len(args) < 1 { log.Fatalf("%s needs a command to run", os.Args[0]) } + err := os.Setenv("TOR_PT_EXIT_ON_STDIN_CLOSE", "1") + if err != nil { + log.Fatal(err) + } cmd := exec.Command(args[0], args[1:]...) stdin, err := cmd.StdinPipe() if err != nil { @@ -32,6 +43,7 @@ func main() { log.Fatal(err) } io.Copy(stdin, os.Stdin) + stdin.Close() err = cmd.Wait() if err != nil { log.Fatal(err)

1 0

[webwml/master] new tarballs are up
by arma＠torproject.org 06 Apr '15

06 Apr '15

commit 8e3b9d62650c867f596fa6f8d987ed03b6f887ce Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 6 11:56:05 2015 -0400 new tarballs are up --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 62514f3..79d0b34 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.2.5.11 -export DEVTAG=tor-0.2.6.6 +export STABLETAG=tor-0.2.5.12 +export DEVTAG=tor-0.2.6.7 WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 7b2fc82..8f50b5b 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.2.5.11</define-tag> -<define-tag version-alpha whitespace=delete>0.2.6.6</define-tag> +<define-tag version-stable whitespace=delete>0.2.5.12</define-tag> +<define-tag version-alpha whitespace=delete>0.2.6.7</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.5.11</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.5.10</define-tag>

1 0

[tor/release-0.2.6] bump version to 0.2.6.7-dev
by nickm＠torproject.org 06 Apr '15

06 Apr '15

commit f620b8f03286de641329cd9ae2027f3628a7d2a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 6 10:01:16 2015 -0400 bump version to 0.2.6.7-dev --- 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 f88cfc2..cc271c8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.7]) +AC_INIT([tor],[0.2.6.7-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5365460..b8798d8 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.2.6.7" +!define VERSION "0.2.6.7-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 e9591e1..b014a12 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.6.7" +#define VERSION "0.2.6.7-dev"

1 0