- tor-commits - lists.torproject.org

[tor-browser-bundle/hardened-builds] Bug 18127: Add LXC support for building with Debian guest VMs
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit f02e6d9110b390f97af0dd8c0ee3b525f6e5d8b8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 7 12:59:46 2016 +0100 Bug 18127: Add LXC support for building with Debian guest VMs --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/make-vms.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fdc1bf6..b9bf0f9 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -14,6 +14,7 @@ packages: - "libxml2-utils" - "sqlite3" - "python-lxml" +- "rsync" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a886572..3aaec92 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -146,7 +146,7 @@ script: | # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . - mkdir vcversioner-1.14.1.1-py2.6.egg + mkdir vcversioner-1.14.1.1-py2.7.egg $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..554cc27 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,13 +25,20 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch.qcow2 ]; + if [ ! -f ./base-$dist-$arch ]; then if [ "z$USE_LXC" = "z1" ]; then export LXC_SUITE=$dist export LXC_ARCH=$arch - ./bin/make-base-vm --suite $dist --lxc --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --lxc --arch $arch + fi else if [ "$dist" = "wheezy" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: use $GITIAN_TAG in fetch-inputs.sh
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 954e6d2d88c49fe7f243aa90b47e56ff616daf7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 16 19:30:02 2016 +0100 Bug 18127: use $GITIAN_TAG in fetch-inputs.sh --- gitian/fetch-inputs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 5aed842..7c9daee 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -243,8 +243,7 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-3 -git merge origin/tor-browser-builder-3 +git checkout "$GITIAN_TAG" cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: install debian-archive-keyring on Ubuntu
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 770346a8468f18bbb395c695208118c1dc6c6f2d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 1 12:39:33 2016 +0100 Bug 18127: install debian-archive-keyring on Ubuntu The Debian keyring is required by debootstrap when generating a Debian chroot. --- gitian/check-prerequisites.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..6b88a90 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring" exit 1 fi else

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: fix base-vm file name when using KVM
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit eb7ae40c498029994daa38d48a64a152ca1129e1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 29 17:27:41 2016 +0200 Bug 18127: fix base-vm file name when using KVM The base-vm file name is different if we are using LXC or KVM. --- gitian/make-vms.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 554cc27..089865b 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,7 +25,8 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch ]; + if [ "z$USE_LXC" = "z1" -a ! -f ./base-$dist-$arch ] \ + || [ "z$USE_LXC" != "z1" -a ! -f ./base-$dist-$arch.qcow2 ]; then if [ "z$USE_LXC" = "z1" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18698: Include libgconf2-dev for our Linux builds
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 988566ec934df8b440bc83cee5b6ac34a21149fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 1 01:16:09 2016 +0000 Bug 18698: Include libgconf2-dev for our Linux builds --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index c49636a..d21b342 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -19,6 +19,8 @@ packages: - "python-dev" # To pass configure since ESR 31. - "libpulse-dev" +# To pass configure since ESR 45. +- "libgconf2-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00"

1 0

[tor-browser-bundle/hardened-builds] Bumping gitian-builder tag for nightlies
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit db4f5aa9836c36f3cad96c3677bd058f5a9cd19c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 29 12:26:41 2016 +0000 Bumping gitian-builder tag for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 43c3c9a..e7c5b3d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[metrics-lib/master] Parse hostnames from dir-source lines.
by karsten＠torproject.org 11 Apr '16

11 Apr '16

commit 783dad184bcda8b7305d9a741e2420d0a1e938e8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 24 14:40:23 2015 +0100 Parse hostnames from dir-source lines. Implements #17934. --- CHANGELOG.md | 2 ++ src/org/torproject/descriptor/DirSourceEntry.java | 3 +++ src/org/torproject/descriptor/RelayNetworkStatusVote.java | 3 +++ src/org/torproject/descriptor/impl/DirSourceEntryImpl.java | 10 ++++++++++ .../torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 6 ++++++ .../descriptor/impl/RelayNetworkStatusConsensusImplTest.java | 8 ++++++++ .../descriptor/impl/RelayNetworkStatusVoteImplTest.java | 4 +++- 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4daab24..b4b24d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ - Support hidden-service statistics in extra-info descriptors. - Support onion-key and ntor-onion-key cross certificates in server descriptors. + - Include the hostname in directory source entries of consensuses + and votes. * Minor changes - Start using Java 7 features like the diamond operator and switch diff --git a/src/org/torproject/descriptor/DirSourceEntry.java b/src/org/torproject/descriptor/DirSourceEntry.java index 57a3967..da898d0 100644 --- a/src/org/torproject/descriptor/DirSourceEntry.java +++ b/src/org/torproject/descriptor/DirSourceEntry.java @@ -13,6 +13,9 @@ public interface DirSourceEntry { /* Return the identity fingerprint. */ public String getIdentity(); + /* Return the hostname. */ + public String getHostname(); + /* Return the IP address. */ public String getIp(); diff --git a/src/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/org/torproject/descriptor/RelayNetworkStatusVote.java index bf4ea6b..f4fad2a 100644 --- a/src/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -100,6 +100,9 @@ public interface RelayNetworkStatusVote extends Descriptor { /* Return the directory identity. */ public String getIdentity(); + /* Return the hostname. */ + public String getHostname(); + /* Return the IP address. */ public String getAddress(); diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index 3ea0179..5e39cfe 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -129,6 +129,11 @@ public class DirSourceEntryImpl implements DirSourceEntry { } this.nickname = ParseHelper.parseNickname(line, nickname); this.identity = ParseHelper.parseTwentyByteHexString(line, parts[2]); + if (parts[3].length() < 1) { + throw new DescriptorParseException("Illegal hostname in '" + line + + "'."); + } + this.hostname = parts[3]; this.ip = ParseHelper.parseIpv4Address(line, parts[4]); this.dirPort = ParseHelper.parsePort(line, parts[5]); this.orPort = ParseHelper.parsePort(line, parts[6]); @@ -170,6 +175,11 @@ public class DirSourceEntryImpl implements DirSourceEntry { return this.isLegacy; } + private String hostname; + public String getHostname() { + return this.hostname; + } + private String ip; public String getIp() { return this.ip; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index c16a9f9..7d59282 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -343,6 +343,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl throw new DescriptorParseException("Illegal hostname in '" + line + "'."); } + this.hostname = parts[3]; this.address = ParseHelper.parseIpv4Address(line, parts[4]); this.dirPort = ParseHelper.parsePort(line, parts[5]); this.orPort = ParseHelper.parsePort(line, parts[6]); @@ -441,6 +442,11 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl return this.identity; } + private String hostname; + public String getHostname() { + return this.hostname; + } + private String address; public String getAddress() { return this.address; diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index 42feb8b..dbe6cd3 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -300,6 +300,8 @@ public class RelayNetworkStatusConsensusImplTest { assertEquals(30000, (int) consensus.getConsensusParams().get( "CircuitPriorityHalflifeMsec")); assertEquals("86.59.21.38", consensus.getDirSourceEntries().get( + "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4").getHostname()); + assertEquals("86.59.21.38", consensus.getDirSourceEntries().get( "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4").getIp()); assertTrue(consensus.containsStatusEntry( "00795A6E8D91C270FC23B30F388A495553E01894")); @@ -723,6 +725,12 @@ public class RelayNetworkStatusConsensusImplTest { } @Test(expected = DescriptorParseException.class) + public void testDirSourceHostnameMissing() + throws DescriptorParseException { + DirSourceBuilder.createWithHostName(""); + } + + @Test(expected = DescriptorParseException.class) public void testDirSourceAddress24() throws DescriptorParseException { DirSourceBuilder.createWithAddress("212.112.245"); } diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index c6b2fc7..17f59a8 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -905,9 +905,11 @@ public class RelayNetworkStatusVoteImplTest { public void testHostname256() throws DescriptorParseException { /* This test doesn't fail, because we're not parsing the hostname. */ - VoteBuilder.createWithDirSourceLine("dir-source urras " + RelayNetworkStatusVote vote = + VoteBuilder.createWithDirSourceLine("dir-source urras " + "80550987E1D626E3EBA5E5E75A458DE0626D088C 256.256.256.256 " + "208.83.223.34 443 80"); + assertEquals("256.256.256.256", vote.getHostname()); } @Test(expected = DescriptorParseException.class)

1 0

[webwml/master] try to make it clearer that execdir/donations/etc are not helpdesk
by arma＠torproject.org 11 Apr '16

11 Apr '16

commit 3d753a18495742eca78835e5a5f5ee75034656b6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 01:02:33 2016 -0400 try to make it clearer that execdir/donations/etc are not helpdesk --- about/en/contact.wml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index f4144a9..b3d667d 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -61,7 +61,9 @@ <a id="email"></a> <h3><a class="anchor" href="#email">Email</a></h3> <p>If you have Tor questions, please try to help yourself via the - above support venues.</p> + above support venues. Please don't use the below contact addresses + for helpdesk or user requests — we all get too much mail and + we won't be able to help you there.</p> <ul> <li><i>donations(a)torproject.org</i> is for questions and comments about <a

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 11 Apr '16

11 Apr '16

commit 2dddd9f4848c4a4d8abebdb91afa3fbcdf0498e4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 11 03:15:54 2016 +0000 Update translations for tor-launcher-properties --- ko/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties index 5e57782..6f79f3e 100644 --- a/ko/torlauncher.properties +++ b/ko/torlauncher.properties @@ -52,7 +52,7 @@ torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! torlauncher.bootstrapWarning.done=완료 torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 -torlauncher.bootstrapWarning.misc=잡동사니 +torlauncher.bootstrapWarning.misc=기타 torlauncher.bootstrapWarning.resourcelimit=리소스 부족 torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 10 Apr '16

10 Apr '16

commit 1b3db5b74991074baee5f75171bcb276552db01c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 10 23:46:59 2016 +0000 Update translations for tails-onioncircuits_completed --- pl/onioncircuits.pot | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/pl/onioncircuits.pot b/pl/onioncircuits.pot new file mode 100644 index 0000000..41e11e1 --- /dev/null +++ b/pl/onioncircuits.pot @@ -0,0 +1,92 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# sebx, 2016 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-10 23:28+0000\n" +"Last-Translator: sebx\n" +"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: ../onioncircuits:81 +msgid "" +"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Nie udało połączyć się z Tor deamon. Obwody Onion spróbują ponownie połączyć się..." + +#: ../onioncircuits:94 +msgid "Onion Circuits" +msgstr "Obwody Onion" + +#: ../onioncircuits:95 +msgid "Display Tor circuits and streams" +msgstr "Pokaż obwody Tora i jego strumieni" + +#: ../onioncircuits:107 +msgid "OK" +msgstr "OK" + +#: ../onioncircuits:124 +msgid "Path" +msgstr "Ścieżka" + +#: ../onioncircuits:125 +msgid "Status" +msgstr "Status" + +#: ../onioncircuits:141 +msgid "Click on a path to get details" +msgstr "Kliknij na ścieżkę po więcej szczegółów." + +#: ../onioncircuits:215 +msgid "" +"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Utracono połączenie z Tor deamon. Obwody Onion spróbują połączyć się ponownie..." + +#: ../onioncircuits:232 +msgid "Connected to the Tor daemon! You can use now Onion Circuits." +msgstr "Połączono z Tor deamon. Możesz teraz używać obwody onion." + +#: ../onioncircuits:314 +msgid "Building..." +msgstr "Budowanie..." + +#: ../onioncircuits:339 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../onioncircuits:564 +msgid "Fingerprint:" +msgstr "Fingerprint:" + +#: ../onioncircuits:565 +msgid "Published:" +msgstr "Publiczny:" + +#: ../onioncircuits:566 +msgid "IP:" +msgstr "IP:" + +#: ../onioncircuits:566 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:567 +msgid "Bandwidth:" +msgstr "Przepustowość:" + +#: ../onioncircuits:567 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/s"

1 0