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

[tor/master] Add a rend cache failure info dup function
by nickm＠torproject.org 11 Sep '15

11 Sep '15

commit 8b981725798880a8bc8b1bee638e4285ffb7fe5a Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Sep 11 15:09:07 2015 +0200 Add a rend cache failure info dup function When validating a new descriptor against our rend cache failure, we were added the failure entry to the new cache entry without duplicating. It was then freed just after the validation ending up in a very bad memory state that was making tor abort(). To fix this, a dup function has been added and used just before adding the failure entry. Fixes #17041 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendcache.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/or/rendcache.c b/src/or/rendcache.c index fe9a134..542d322 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -334,6 +334,17 @@ cache_failure_intro_lookup(const uint8_t *identity, const char *service_id, return 0; } +/** Allocate a new cache failure intro object and copy the content from + * entry to this newly allocated object. Return it. */ +static rend_cache_failure_intro_t * +cache_failure_intro_dup(const rend_cache_failure_intro_t *entry) +{ + rend_cache_failure_intro_t *ent_dup = + rend_cache_failure_intro_entry_new(entry->failure_type); + ent_dup->created_ts = entry->created_ts; + return ent_dup; +} + /** Add an intro point failure to the failure cache using the relay * identity and service ID service_id. Record the * failure in that object. */ @@ -383,12 +394,15 @@ validate_intro_point_failure(const rend_service_descriptor_t *desc, found = cache_failure_intro_lookup(identity, service_id, &entry); if (found) { + /* Dup here since it will be freed at the end when removing the + * original entry in the cache. */ + rend_cache_failure_intro_t *ent_dup = cache_failure_intro_dup(entry); /* This intro point is in our cache, discard it from the descriptor * because chances are that it's unusable. */ SMARTLIST_DEL_CURRENT(desc->intro_nodes, intro); rend_intro_point_free(intro); /* Keep it for our new entry. */ - digestmap_set(new_entry->intro_failures, (char *) identity, entry); + digestmap_set(new_entry->intro_failures, (char *) identity, ent_dup); continue; } } SMARTLIST_FOREACH_END(intro);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 11 Sep '15

11 Sep '15

commit 769e682313bdd3ea26bdbc492c3158e1b0698c28 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 14:04:54 2015 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This is part of the fix for bug 16909. We need to adapt our update packaging tools to cope with the HTTPS Everywhere extension ID change introduced by version 5.1.0. --- tools/update-packaging/make_full_update.sh | 5 ++++- tools/update-packaging/make_incremental_update.sh | 13 ++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 62baf4c..3578ae4 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -11,7 +11,10 @@ . $(dirname "$0")/common.sh # TODO: it would be better to pass this as a command line option. -directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' +# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it +# exists. The extension ID got changed with the version bump to 5.1.0. +ext_path='TorBrowser/Data/Browser/profile.default/extensions' +directories_to_remove="$ext_path/https-everywhere(a)eff.org $ext_path/https-everywhere-eff(a)eff.org" # ----------------------------------------------------------------------------- diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 0e1e3f6..c803809 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -64,7 +64,8 @@ check_for_forced_update() { fi # If the file in the skip list ends with /*, do a prefix match. - # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org/* to be used to force all HTTPS Everywhere files to be updated. + # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org/* + # to be used to force all HTTPS Everywhere files to be updated. f_suffix=${f##*/} if [[ $f_suffix = "*" ]]; then f_prefix="${f%\/\*}"; @@ -122,7 +123,7 @@ archivefiles="updatev2.manifest updatev3.manifest" # If the NoScript or HTTPS Everywhere extensions have changed between # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' -https_everywhere='https-everywhere(a)eff.org' +https_everywhere='https-everywhere-eff(a)eff.org' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -144,12 +145,14 @@ https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" diff "$olddir/$https_everywhere_install_rdf" \ "$newdir/$https_everywhere_install_rdf" > /dev/null rc=$? -if [ $rc -gt 1 ]; then +if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" exit 2 -elif [ $rc -eq 1 ]; then +elif [ $rc -ge 1 ]; then requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - directories_to_remove="$directories_to_remove $ext_path/$https_everywhere" + # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it + # exists. The extension ID got changed with the version bump to 5.1.0. + directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" fi mkdir -p "$workdir"

1 0

[tor-browser-bundle/master] Bug 16909: Adapt to HTTPS-Everyhwere build changes
by gk＠torproject.org 11 Sep '15

11 Sep '15

commit f8a4557bb2a46f06e664e47a57a7065322dbbd35 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 8 15:18:17 2015 +0000 Bug 16909: Adapt to HTTPS-Everyhwere build changes There are two changes that got made recently: 1) The extension ID got renamed due to conflicts on the AMO dashboard with the version hosted by Mozilla. 2) Translations moved to an own git submodule. The first change is unproblematic. For the second one, however, we need to bump the mininmum Ubuntu version for the host operating system to 14.04. We want to initialize and update the submodules right while we are fetching the inputs and not during build time to be not dependent on network access during the bundling step. This fails on Ubuntu 12.04 due to an old git version (1.7.9.5) that uses abolute paths to locate submodules. As this path is not available on the build VM the build breaks. This does not affect Debian Wheezy (which ships with git 1.7.10.4) nor any later Debian version. In order to make this change obvious for 12.04 users we include an Ubuntu version check in check-prerequisites.sh. Additionally, we cleaned the bundling descriptors up to implement a proper solution for #10066 instead of working around that bug. --- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 25 ++++++++++++++++--------- gitian/descriptors/linux/gitian-bundle.yml | 18 ++++++++++++------ gitian/descriptors/mac/gitian-bundle.yml | 18 ++++++++++++------ gitian/descriptors/windows/gitian-bundle.yml | 18 ++++++++++++------ gitian/fetch-inputs.sh | 9 ++++++++- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 9 files changed, 64 insertions(+), 32 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 656dddd..f289791 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,6 +1,6 @@ QuickStart: - On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run: + On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run: $ make diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 32c9b7b..cc16d0e 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -6,7 +6,7 @@ if [ ! -f /etc/debian_version ]; then echo "Gitian is dependent upon the Ubuntu Virtualization Tools." echo - echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer." + echo "You need to run Ubuntu 14.04 LTS/Debian Wheezy or newer." exit 1 fi @@ -14,15 +14,22 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then - dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null - - if [ $? -ne 0 ]; + VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + if [ "$VERSION" -ge "14" ]; then - echo "You are missing one or more Gitian build tool dependencies." - echo - echo "Please run:" - echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run:" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + exit 1 + fi + else + echo "Your Ubuntu is too old. You need Ubuntu 14.04 LTS or newer to build Tor Browser with Gitian." exit 1 fi elif [ $DISTRO = "Debian" ]; diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index afb632e..a8f8d51 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -66,7 +66,7 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/Caches mkdir -p tor-browser/Browser/TorBrowser/Docs/sources/ @@ -100,10 +100,16 @@ script: | cd ../../../ # cd https-everywhere - # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in - # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh + # We are invoking the build script with a particular tag to avoid #10066. This + # does not work for nightlies as there is no "master" tag in that sense. But + # we don't need to care about that as we don't need reproducibility for + # nightly builds. + if [ $HTTPSE_TAG != "master" ]; + then + ./makexpi.sh $HTTPSE_TAG + else + ./makexpi.sh + fi # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -112,7 +118,7 @@ script: | cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere(a)eff.org/ + cd https-everywhere-eff(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index da441a2..bd54f0d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -74,7 +74,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches mkdir -p $TORBROWSER_NAME.app/TorBrowser/Docs/sources @@ -102,10 +102,16 @@ script: | cd ../../../ # cd https-everywhere - # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in - # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh + # We are invoking the build script with a particular tag to avoid #10066. This + # does not work for nightlies as there is no "master" tag in that sense. But + # we don't need to care about that as we don't need reproducibility for + # nightly builds. + if [ $HTTPSE_TAG != "master" ]; + then + ./makexpi.sh $HTTPSE_TAG + else + ./makexpi.sh + fi # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -114,7 +120,7 @@ script: | cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere(a)eff.org + cd https-everywhere-eff(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index d4ae0fa..b821528 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -65,7 +65,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources @@ -90,10 +90,16 @@ script: | cd ../../../ # cd https-everywhere - # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in - # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh + # We are invoking the build script with a particular tag to avoid #10066. This + # does not work for nightlies as there is no "master" tag in that sense. But + # we don't need to care about that as we don't need reproducibility for + # nightly builds. + if [ $HTTPSE_TAG != "master" ]; + then + ./makexpi.sh $HTTPSE_TAG + else + ./makexpi.sh + fi # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -102,7 +108,7 @@ script: | cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere(a)eff.org + cd https-everywhere-eff(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 42efa33..22162b0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${!URL}" done -# NoScript and HTTPS-Everywhere are magikal and special: +# NoScript is magikal and special: wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check @@ -281,5 +281,12 @@ obfs4 https://git.torproject.org/pluggable-transports/obfs4.git noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG EOF +# HTTPS-Everywhere is special, too. We need to initialize the git submodules and +# update them here. Otherwise it would happen during the build. +cd https-everywhere +git submodule init +git submodule update +cd .. + exit 0 diff --git a/gitian/versions b/gitian/versions index b833342..70801b2 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2 -HTTPSE_TAG=5.0.7 +HTTPSE_TAG=5.1.0 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f37b98a..679da18 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.3 -HTTPSE_TAG=5.0.7 +HTTPSE_TAG=5.1.0 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index c2143a0..8c4cfa9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=5.0.2 +HTTPSE_TAG=5.1.0 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[webwml/master] Update press clips
by sebastian＠torproject.org 11 Sep '15

11 Sep '15

commit becbe5859f655dd2af93f7fc4e84adad0a0cd0e1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 11 08:13:40 2015 +0200 Update press clips --- press/en/press.wml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index b2e4272..3404621 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -49,6 +49,11 @@ some of the significant Tor-related stories that have popped up. <th>Topic</th> </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2015 Sep 10</td> +<td>Motherboard</td> +<td><a href="http://motherboard.vice.com/read/internet-regulators-just-legitimized-the-d…">Privacy by design, thanks to Tor's Jacob Appelbaum and Facebook's Alec Muffett</a></td> +</tr> <tr style=""> <td>2015 Aug 31</td> <td>Statesman</td>

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 11 Sep '15

11 Sep '15

commit a73e5e0b64a7ce1a7c3f56a457a12a5821495d94 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 11 00:46:23 2015 +0000 Update translations for tor-messenger-conversationsproperties_completed --- id/conversations.properties | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/id/conversations.properties b/id/conversations.properties index ccffcb0..0fd5d41 100644 --- a/id/conversations.properties +++ b/id/conversations.properties @@ -37,11 +37,11 @@ accountReconnected=Akun Anda telah tersambung kembali. # LOCALIZATION NOTE (autoReply): # %S is replaced by the text of a message that was sent as an automatic reply. -autoReply=Oto-balas - %S +autoReply=Balas-otomatis - %S # LOCALIZATION NOTE (noTopic): # Displayed instead of the topic when no topic is set. -noTopic=Tidak ada pesan topik untuk kamar ini. +noTopic=Tidak ada pesan topik untuk ruang ini. # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. @@ -56,6 +56,17 @@ topicChanged=%1$S telah mengubah topik ke: %2$S. # %1$S is the user who cleared the topic. topicCleared=%1$S telah mengosongkan topik. +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S diketahui sebagai %2$S. +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=Sekarang anda disebut sebagai %S. + # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut messenger.conversations.selections.ellipsis=[…]

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 11 Sep '15

11 Sep '15

commit 7f218164112798710cdaf5324b9787e33ee6e07b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 11 00:46:18 2015 +0000 Update translations for tor-messenger-conversationsproperties --- id/conversations.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/conversations.properties b/id/conversations.properties index 4aea56e..0fd5d41 100644 --- a/id/conversations.properties +++ b/id/conversations.properties @@ -37,11 +37,11 @@ accountReconnected=Akun Anda telah tersambung kembali. # LOCALIZATION NOTE (autoReply): # %S is replaced by the text of a message that was sent as an automatic reply. -autoReply=Oto-balas - %S +autoReply=Balas-otomatis - %S # LOCALIZATION NOTE (noTopic): # Displayed instead of the topic when no topic is set. -noTopic=Tidak ada pesan topik untuk kamar ini. +noTopic=Tidak ada pesan topik untuk ruang ini. # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. @@ -61,11 +61,11 @@ topicCleared=%1$S telah mengosongkan topik. # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S diketahui sebagai %2$S. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Sekarang anda disebut sebagai %S. # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut

1 0

[tor-messenger-build/master] Run "dpkg --add-architecture i386" on linux-i686 builds
by boklm＠torproject.org 10 Sep '15

10 Sep '15

commit c0c64f886175164edf8df3f5a91c2f22fe33ace0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 11 00:22:55 2015 +0200 Run "dpkg --add-architecture i386" on linux-i686 builds This makes installation of i386 build dependencies possible. --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index 91d46ac..7e41946 100644 --- a/rbm.conf +++ b/rbm.conf @@ -54,6 +54,7 @@ targets: osname: linux-i686 configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' compiler: gcc + pre_pkginst: dpkg --add-architecture i386 windows-i686: arch: i686 var:

1 0

[tor-messenger-build/master] Add gk's pgp key
by boklm＠torproject.org 10 Sep '15

10 Sep '15

commit bfb6a421b9bae2f133be853766efee6c3c794c27 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 23:39:50 2015 +0200 Add gk's pgp key --- keyring/gk.gpg | Bin 0 -> 33866 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/gk.gpg b/keyring/gk.gpg new file mode 100644 index 0000000..ad731ca Binary files /dev/null and b/keyring/gk.gpg differ

1 0

[tor-messenger-build/master] Don't build python: the Wheezy version is recent enough
by boklm＠torproject.org 10 Sep '15

10 Sep '15

commit ef0675501bf8e2aae082e009b4cedb50a4f1e325 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 23:56:57 2015 +0200 Don't build python: the Wheezy version is recent enough --- projects/instantbird/build | 2 -- projects/instantbird/config | 3 --- projects/python/build | 15 --------------- projects/python/config | 22 ---------------------- 4 files changed, 42 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index a422cce..7870dd6 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -11,8 +11,6 @@ ln -s /var/tmp/dist/gcc/bin/gcc /var/tmp/dist/gcc/bin/cc mkdir -p /var/tmp/dist cd /var/tmp/dist [% IF c("var/linux") -%] -tar xf $rootdir/[% c('input_files_by_name/python') %] -export PATH="/var/tmp/dist/python/bin:$PATH" tar xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] diff --git a/projects/instantbird/config b/projects/instantbird/config index e64a674..5681e6f 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -125,9 +125,6 @@ input_files: enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - - name: python - project: python - enable: '[% c("var/linux") %]' - name: binutils project: binutils enable: '[% c("var/linux") %]' diff --git a/projects/python/build b/projects/python/build deleted file mode 100644 index e27d06a..0000000 --- a/projects/python/build +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -rootdir=$(pwd) -distdir=/var/tmp/dist/python -mkdir -p $distdir -tar xf [% c('input_files_by_name/python') %] -cd Python-[% c('version') %] -./configure --prefix=$distdir -make -j4 -make prefix=$distdir install -cd /var/tmp/dist -[% c('tar', { - tar_src => 'python', - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/python/config b/projects/python/config deleted file mode 100644 index 9c21725..0000000 --- a/projects/python/config +++ /dev/null @@ -1,22 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.7.8 -filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/codename") %]-[% c("var/build_id") %].tar.gz' -lsb_release: - id: Debian - release: 7.8 - codename: wheezy -remote_docker: 1 -var: - deps: - - xz-utils - - build-essential - - python-all - - zlib1g-dev - - libssl-dev -input_files: - - name: python - URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz' - gpg_keyring: python.gpg - sig_ext: asc - file_gpg_id: 1 - - project: docker-image

1 0

[tor-messenger-build/master] tor-launcher: update to 0.2.7.7
by boklm＠torproject.org 10 Sep '15

10 Sep '15

commit 1c0dcb013bcddd29419ef27dad96ab613d82983b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 23:41:18 2015 +0200 tor-launcher: update to 0.2.7.7 --- projects/tor-launcher/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3e3bc2b..a48b4e8 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,8 +1,8 @@ # vim: filetype=yaml sw=2 -version: 0.2.7.6 +version: 0.2.7.7 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' -gpg_keyring: mikeperry.gpg +gpg_keyring: gk.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files:

1 0