September 2017 - tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Sep '17

19 Sep '17

commit cba760b598f71fbdcf216e499485d28722c3de38 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 19 17:45:15 2017 +0000 Update translations for torcheck --- sl/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sl/torcheck.po b/sl/torcheck.po index aae894fdd..979737bc3 100644 --- a/sl/torcheck.po +++ b/sl/torcheck.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2017-09-19 17:29+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 Sep '17

19 Sep '17

commit a840afe0dc4c8b803dd3854cb66a297e38e9da31 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 19 17:45:10 2017 +0000 Update translations for bridgedb_completed --- ja/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index b1ddf370e..3b7b3e236 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -14,7 +14,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-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-19 17:20+0000\n" "Last-Translator: ABE Tsunehiko\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Sep '17

19 Sep '17

commit 1d5cc860363a422305d3cf5cc6e7429075152e55 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 19 17:45:05 2017 +0000 Update translations for bridgedb --- ja/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index b1ddf370e..3b7b3e236 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -14,7 +14,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-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2017-09-19 17:20+0000\n" "Last-Translator: ABE Tsunehiko\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Add gitlab-ci
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 859de8bfeb3774802317df016f254d922e5037ed Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 16:18:49 2017 +0000 Add gitlab-ci --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..388563418 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,37 @@ +before_script: + - "apt-get update -qq" + - "apt-get upgrade -y" + - "apt-get install -y --fix-missing git" + # Install ssh-agent if not already installed, it is required by Docker. + # (change apt-get to yum if you use a CentOS-based image) + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + + # Run ssh-agent (inside the build environment) + - eval $(ssh-agent -s) + + # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store + - ssh-add <(echo "$DEPLOY_KEY") + + # For Docker builds disable host key checking. Be aware that by adding that + # you are suspectible to man-in-the-middle attacks. + # WARNING: Use this only with the Docker executor, if you use it with shell + # you will overwrite your user's SSH config. + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + # In order to properly check the server's host key, assuming you created the + # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines + # instead. + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' + +update: + script: + - echo "merging from torgit" + - git clone git@oniongit.eu:hiro/tor.git + - "cd tor" + - git remote add upstream https://git.torproject.org/tor.git + - git checkout master + - git config --global user.email "labadmin(a)oniongit.eu" + - git config --global user.name "gitadmin" + - git pull -Xtheirs upstream master + - git push origin master

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 7346c93822d78e6bec3600f0aedaccd0232a0625 Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 16:52:16 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 388563418..b6e1bf48b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,14 +23,17 @@ before_script: # instead. - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - +test: + script: + - "sh autogen.sh && ./configure && make && make install" + update: - script: - - echo "merging from torgit" - - git clone git@oniongit.eu:hiro/tor.git - - "cd tor" - - git remote add upstream https://git.torproject.org/tor.git - - git checkout master + script: + - echo "merging from torgit" + - git clone git@oniongit.eu:hiro/tor.git + - "cd tor" + - git remote add upstream https://git.torproject.org/tor.git + - git checkout master - git config --global user.email "labadmin(a)oniongit.eu" - git config --global user.name "gitadmin" - git pull -Xtheirs upstream master

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 15bc2b1a647030456f57cf4a5deebee516ef6efe Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 16:53:50 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6e1bf48b..335f1eeef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ before_script: test: script: - "sh autogen.sh && ./configure && make && make install" + - "make test-full-online" update: script:

1 0

[tor/master] Fix yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 086a6702c45840ab835aa5435653ae4fc2991f45 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 1 18:56:58 2017 +0200 Fix yml --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2634b4b8..2ab8800cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ before_script: - "apt-get update -qq" - "apt-get upgrade -y" - + build: script: - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" @@ -12,7 +12,7 @@ build: update: script: - "apt-get install -y --fix-missing git openssh-client" - - + # Run ssh-agent (inside the build environment) - eval $(ssh-agent -s) @@ -31,10 +31,9 @@ update: - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - echo "merging from torgit" - - "cd tor" - - "mkdir tor" - - git clone --bare https://git.torproject.org/tor.git - - git checkout master - git config --global user.email "labadmin(a)oniongit.eu" - git config --global user.name "gitadmin" + - "mkdir tor" + - "cd tor" + - git clone --bare https://git.torproject.org/tor.git - git push --mirror git@oniongit.eu:hiro/tor.git \ No newline at end of file

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit 7bdbd870e86f708c372f507a0da7772e896ddeb9 Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 18:11:55 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81023fd09..94e39f14e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ before_script: - "apt-get update -qq" - "apt-get upgrade -y" - - "apt-get install -y --fix-missing git openssh-client wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" + - "apt-get install -y --fix-missing git openssh-client asciidoc-base wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" # Run ssh-agent (inside the build environment) - eval $(ssh-agent -s)

1 0

[tor/master] Make ci faster to run
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit e918f83c1cccb080bdf84300e428cf9a66be3139 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Sep 1 18:35:13 2017 +0200 Make ci faster to run --- .gitlab-ci.yml | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef2847154..13ea324f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,34 +1,35 @@ -before_script: - - "apt-get update -qq" - - "apt-get upgrade -y" - - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store - - ssh-add <(echo "$DEPLOY_KEY") - - # For Docker builds disable host key checking. Be aware that by adding that - # you are suspectible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - # In order to properly check the server's host key, assuming you created the - # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines - # instead. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - build: script: + - "apt-get update -qq" + - "apt-get upgrade -y" + - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" - "sh autogen.sh && ./configure && make" - "make check" - "make install" update: script: + - "apt-get update -qq" + - "apt-get upgrade -y" + - "apt-get install -y --fix-missing git openssh-client" + - + # Run ssh-agent (inside the build environment) + - eval $(ssh-agent -s) + + # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store + - ssh-add <(echo "$DEPLOY_KEY") + + # For Docker builds disable host key checking. Be aware that by adding that + # you are suspectible to man-in-the-middle attacks. + # WARNING: Use this only with the Docker executor, if you use it with shell + # you will overwrite your user's SSH config. + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + # In order to properly check the server's host key, assuming you created the + # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines + # instead. + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' - echo "merging from torgit" - git clone --bare https://git.torproject.org/tor.git - "cd tor"

1 0

[tor/master] Update .gitlab-ci.yml
by nickm＠torproject.org 19 Sep '17

19 Sep '17

commit dcda597fd3ec89ba0c339ba7f01abf0ec27e2783 Author: Hiro <me(a)hiro7.eu> Date: Wed Aug 16 16:56:21 2017 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 335f1eeef..eda48c5f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,11 +23,15 @@ before_script: # instead. - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts' -test: + +build: script: - "sh autogen.sh && ./configure && make && make install" + +test: + script: - "make test-full-online" - + update: script: - echo "merging from torgit" @@ -35,7 +39,7 @@ update: - "cd tor" - git remote add upstream https://git.torproject.org/tor.git - git checkout master - - git config --global user.email "labadmin(a)oniongit.eu" - - git config --global user.name "gitadmin" - - git pull -Xtheirs upstream master - - git push origin master + - git config --global user.email "labadmin(a)oniongit.eu" + - git config --global user.name "gitadmin" + - git pull -Xtheirs upstream master + - git push origin master

1 0