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

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 10 Sep '12

10 Sep '12

commit 748ff45b3c17a4b37161c690de9c20b05ba315cb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 10 17:15:30 2012 +0000 Update translations for whisperback_completed --- fr/fr.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 3bbd4f1..738d534 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# arpalord <arpalord(a)gmail.com>, 2012. # MaK <>, 2012. # Tails developpers <amnesia(a)boum.org>, 2011. msgid "" @@ -10,14 +11,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-03-11 17:08+0000\n" -"Last-Translator: MaK <>\n" +"PO-Revision-Date: 2012-09-10 17:06+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. XXX use a better exception #: ../whisperBack/whisperback.py:63 @@ -158,8 +159,8 @@ msgid "Send feedback in an encrypted mail." msgstr "Envoyer vos remarques dans un mail chiffré." #: ../whisperBack/gui.py:405 -msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" -msgstr "Copyright © 2009-2011 développeurs de Tails (tails(a)boum.org)" +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "Copyright © 2009-2012 Les développeurs de Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -183,8 +184,8 @@ msgid "Bug description" msgstr "Description du problème" #: ../data/whisperback.ui.h:3 -msgid "Copyright © 2009-2011 tails(a)boum.org" -msgstr "Copyright © 2009-2011 tails(a)boum.org" +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -215,7 +216,7 @@ msgstr "Détails techniques à inclure" #: ../data/whisperback.ui.h:12 msgid "" "WhisperBack - Send feedback in an encrypted mail\n" -"Copyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" "\n" "This program is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" @@ -229,7 +230,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - Envoyer vos remarques dans un email chiffré\nCopyright (C) 2009-2011 développeurs de Tails <tails(a)boum.org>\n\nCe programme est un logiciel libre ; vous pouvez le redistribuer ou le modifier\nsuivant les termes de la Licence Publique Générale GNU telle que publiée par\nla Free Software Foundation : soit la version 3 de cette licence, soit (à votre\ngré) toute version ultérieure.\n\nCe programme est distribué dans l’espoir qu’il vous sera utile, mais SANS\nAUCUNE GARANTIE : sans même la garantie implicite de COMMERCIALISABILITÉ\nni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Publique\nGénérale GNU pour plus de détails.\n\nVous devez avoir reçu une copie de la Licence Publique Générale GNU avec\nce programme ; si ce n'est pas le cas, consultez : <http://www.gnu.org/licenses/>.\n\n" +msgstr "WhisperBack - Envoyer un commentaire dans un mail chiffré\nCopyright (C) 2009-2012 Les développeurs de Tails <tails(a)boum.org>\n\nCe programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier sous les termes de la licence GNU General Public License publiée par la Free Software Foundation; soit la version 3 de la Licence, ou (au choix) toute version ultérieure.\n\nCe programme est distribué dans l'espoir d'être utile, mais SANS AUCUNE GARANTIE; sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN USAGE PARTICULIER. Voir la licence GNU General Public License pour plus d'informations.\n\nVous devriez avoir reçu une copie de la licence GNU General Public License avec ce programme. Dans le cas contraire, voir <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 10 Sep '12

10 Sep '12

commit 4736293137a6a2bbd2ba6cb50ca475d1dc979da3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 10 17:15:28 2012 +0000 Update translations for whisperback --- fr/fr.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 632fa91..738d534 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# arpalord <arpalord(a)gmail.com>, 2012. # MaK <>, 2012. # Tails developpers <amnesia(a)boum.org>, 2011. msgid "" @@ -10,14 +11,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-08-16 09:20+0000\n" -"Last-Translator: MaK <>\n" +"PO-Revision-Date: 2012-09-10 17:06+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. XXX use a better exception #: ../whisperBack/whisperback.py:63 @@ -159,7 +160,7 @@ msgstr "Envoyer vos remarques dans un mail chiffré." #: ../whisperBack/gui.py:405 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2012 Les développeurs de Tails (tails(a)boum.org)" #: ../whisperBack/gui.py:406 msgid "Tails developers <tails(a)boum.org>" @@ -184,7 +185,7 @@ msgstr "Description du problème" #: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2012 tails(a)boum.org" #: ../data/whisperback.ui.h:4 msgid "Help" @@ -229,7 +230,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - Envoyer un commentaire dans un mail chiffré\nCopyright (C) 2009-2012 Les développeurs de Tails <tails(a)boum.org>\n\nCe programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier sous les termes de la licence GNU General Public License publiée par la Free Software Foundation; soit la version 3 de la Licence, ou (au choix) toute version ultérieure.\n\nCe programme est distribué dans l'espoir d'être utile, mais SANS AUCUNE GARANTIE; sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN USAGE PARTICULIER. Voir la licence GNU General Public License pour plus d'informations.\n\nVous devriez avoir reçu une copie de la licence GNU General Public License avec ce programme. Dans le cas contraire, voir <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 10 Sep '12

10 Sep '12

commit eb26342dc68a691fe46e4d056ed4e874c32edb6f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 10 16:45:34 2012 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.properties | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fr/https-everywhere.properties b/fr/https-everywhere.properties index 99ce94a..29a1d06 100644 --- a/fr/https-everywhere.properties +++ b/fr/https-everywhere.properties @@ -1,3 +1,5 @@ https-everywhere.menu.globalEnable = Activer HTTPS Partout https-everywhere.menu.globalDisable = Désactiver HTTPS Partout - +https-everywhere.menu.enableDisable = Activer / Désactiver les règles +https-everywhere.menu.noRules = (Aucune règle pour cette page) +https-everywhere.menu.unknownRules = (Règles pour cette page inconnue)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Sep '12

10 Sep '12

commit aa361955f47cb1fb4f8e0d495f5515a221175cce Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 10 16:45:31 2012 +0000 Update translations for https_everywhere --- fr/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/https-everywhere.properties b/fr/https-everywhere.properties index c6e0ca1..29a1d06 100644 --- a/fr/https-everywhere.properties +++ b/fr/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = Activer HTTPS Partout https-everywhere.menu.globalDisable = Désactiver HTTPS Partout -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Activer / Désactiver les règles +https-everywhere.menu.noRules = (Aucune règle pour cette page) +https-everywhere.menu.unknownRules = (Règles pour cette page inconnue)

1 0

[onionoo/master] Store status bandwidth/weights files in subdirectories.
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit 6238be66c8eed73f9a36704ba3a3d0a218b55bea Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 10 12:27:00 2012 -0400 Store status bandwidth/weights files in subdirectories. Right now, there are 300k bandwidth history files and 140k weights history files in Onionoo's status directory. weasel suggests to store those files in subdirectories, e.g., 1/2/1234567.. to speed up access. Let's do that. The real fix is to use a database, of course. But until we have that, let's try to make the file system based solution not suck. --- .../torproject/onionoo/BandwidthDataWriter.java | 8 ++++++-- src/org/torproject/onionoo/WeightsDataWriter.java | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/onionoo/BandwidthDataWriter.java b/src/org/torproject/onionoo/BandwidthDataWriter.java index 4f86371..7543863 100644 --- a/src/org/torproject/onionoo/BandwidthDataWriter.java +++ b/src/org/torproject/onionoo/BandwidthDataWriter.java @@ -135,7 +135,9 @@ public class BandwidthDataWriter { private void readHistoryFromDisk(String fingerprint, SortedMap<Long, long[]> writeHistory, SortedMap<Long, long[]> readHistory) { - File historyFile = new File("status/bandwidth", fingerprint); + File historyFile = new File(String.format("status/bandwidth/%s/%s/%s", + fingerprint.substring(0, 1), fingerprint.substring(1, 2), + fingerprint)); if (historyFile.exists()) { try { BufferedReader br = new BufferedReader(new FileReader( @@ -226,7 +228,9 @@ public class BandwidthDataWriter { private void writeHistoryToDisk(String fingerprint, SortedMap<Long, long[]> writeHistory, SortedMap<Long, long[]> readHistory) { - File historyFile = new File("status/bandwidth", fingerprint); + File historyFile = new File(String.format("status/bandwidth/%s/%s/%s", + fingerprint.substring(0, 1), fingerprint.substring(1, 2), + fingerprint)); try { historyFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter(historyFile)); diff --git a/src/org/torproject/onionoo/WeightsDataWriter.java b/src/org/torproject/onionoo/WeightsDataWriter.java index b02e0c0..67c07dc 100644 --- a/src/org/torproject/onionoo/WeightsDataWriter.java +++ b/src/org/torproject/onionoo/WeightsDataWriter.java @@ -276,7 +276,9 @@ public class WeightsDataWriter { return a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0; } }); - File historyFile = new File("status/weights", fingerprint); + File historyFile = new File(String.format("status/weights/%s/%s/%s", + fingerprint.substring(0, 1), fingerprint.substring(1, 2), + fingerprint)); if (historyFile.exists()) { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); @@ -377,7 +379,9 @@ public class WeightsDataWriter { private void writeHistoryToDisk(String fingerprint, SortedMap<long[], double[]> history) { - File historyFile = new File("status/weights", fingerprint); + File historyFile = new File(String.format("status/weights/%s/%s/%s", + fingerprint.substring(0, 1), fingerprint.substring(1, 2), + fingerprint)); try { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");

1 0

[tor-cloud/master] update gpg key, set -e, use apt-get
by runa＠torproject.org 10 Sep '12

10 Sep '12

commit 679a3f79136d9c1445e5017ad63dffa060ea2a20 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Sep 10 16:28:22 2012 +0100 update gpg key, set -e, use apt-get --- ec2-prep.sh | 130 ++++++++++++++-------------------------------------------- 1 files changed, 32 insertions(+), 98 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 344cf7f..a32c148 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # ec2-prep by: Jacob Appelbaum # git://git.torproject.org/ioerror/tor-cloud.git # This is the code to run on an Ubuntu machine to prep it as a relay, bridge or @@ -24,8 +24,8 @@ fi # Get the latest package updates echo "Updating the system..." -aptitude update -aptitude -y safe-upgrade +apt-get update +apt-get -y safe-upgrade # Configure unattended-upgrades. The system will automatically download, # install and configure all packages, and reboot if necessary. @@ -117,7 +117,7 @@ echo "Installing Tor's gpg key..."; #gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - cat << EOF > $GPGKEY -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (GNU/Linux) +Version: GnuPG v1.4.10 (GNU/Linux) mQENBEqg7GsBCACsef8koRT8UyZxiv1Irke5nVpte54TDtTl1za1tOKfthmHbs2I 4DHWG3qrwGayw+6yb5mMFe0h9Ap9IbilA5a1IdRsdDgViyQQ3kvdfoavFHRxvGON @@ -125,106 +125,40 @@ tknIyk5Goa36GMBl84gQceRs/4Zx3kxqCV+JYXE9CmdkpkVrh2K3j5+ysDWfD/kO dTzwu3WHaAwL8d5MJAGQn2i6bTw4UHytrYemS1DdG/0EThCCyAnPmmb8iBkZlSW8 6MzVqTrN37yvYWTXk6MwKH50twaX5hzZAlSh9eqRjZLq51DDomO7EumXP90rS5mT QrS+wiYfGQttoZfbh3wl5ZjejgEjx+qrnOH7ABEBAAG0JmRlYi50b3Jwcm9qZWN0 -Lm9yZyBhcmNoaXZlIHNpZ25pbmcga2V5iEYEEBECAAYFAkqqojIACgkQ61qJaiiY -i/WmOgCfTyf3NJ7wHTBckwAeE4MSt5ZtXVsAn0XDq8PWWnk4nK6TlevqK/VoWItF -iEYEEBECAAYFAkqsYDUACgkQO50JPzGwl0voJwCcCSokiJSNY+yIr3nBPN/LJldb -xekAmwfU60GeaWFwz7hqwVFL23xeTpyniEwEExECAAwFAkqg7nQFgwll/3cACgkQ -3nqvbpTAnH+GJACgxPkSbEp+WQCLZTLBP30+5AandyQAniMm5s8k2ccV4I1nr9O0 -qYejOJTiiQE8BBMBAgAmBQJKoOxrAhsDBQkJZgGABgsJCAcDAgQVAggDBBYCAwEC -HgECF4AACgkQ7oy8noht3YmVUAgApMyyFaBxvie1/jAMoQ3uZLjnrP/SWK9Sv9TI -iiJxig4PLSNn+dlu1EZicFoZaGx+wLMhOOuCoLKAVfo3RSF2WgvBePkxqN03hILP -AVuT2kus+7f7y926lkRy2mF+eWVd5CZDoHERABFtgX0Zf24TBz90Cza1tu+1OWiY -gD7zi24AIlFwcU4Up9+ejZWGSG4J3yOZj5xkEAxg5RDKfkbsRVV+ZnqaxcDqe+Gp -u4BFEiNv1r/OyZIA8FbWEjn0rnXDA4ynOsown9paQE0NrMIHrh6fR9+CUyeFzn+x -FhPaNho7k8GAzC02WctTGX5lZRBaLt7MDC1i6eajVcC1eXgtPYhGBBARAgAGBQJL -fZ3YAAoJEGIVlk9bFyqyOUwAn3AT27GjwNQFFVV1z79CnlhWIFWiAKDK948HdTWF -Q+k3tw/siYRs8wg+j4hGBBARAgAGBQJLfpYvAAoJEE5TABmhobwFOBcAn19x+BoJ -v8dMiAL5reAlvAD/ReQ/AKCmqbsG47Bp3E91HTRYh5opwGqtbYhGBBARAgAGBQJM -upo7AAoJEIX3JjEnociaS/oAoIMbOAuaPjs55O1phaz0N5W53wyiAJ4uKdtGkbsM -ekFhh/IaJY800ppuRYheBBARCAAGBQJMwQ/GAAoJEGs3gSxbVNaMQwgA/ilEO50k -SamTmNAiOpwA+7WpPSuyZZNDkSXE94umQ8g/AP992gV8zMNJJ003Seg7n3kGAUzC -vgjVzPoZKx3wYIDw14heBBARCAAGBQJODIXeAAoJEIOiOQv9oooaDa8BAMzqzDE2 -woaPDrBv7Q8YJ5cGPcf5ASKgnwnSi62QjJPVAP4vmBgUAh4NTGmc2a320nqBO/6s -mTmA2M6u/PtBNeli2YicBBABAgAGBQJM1HzlAAoJEOOxXopvEPxCadoD/3RXshNN -kZ91u9t7v+6y7LOvbp7n2C0eaxF1LEmfvMbe+eD60yOMNNqnBji9OT/mzsGyGUYV -PZXDWSXrVWELS9/7AVQCAaGVXtwfsNDIk1oEV3EnSfPRcn6BsqMM3aADu0rlVsAP -yPwz+wkbqbxwuYWaXn36/55ijhUD9d+XmpFgiQEcBBABAgAGBQJMkWqmAAoJEGOQ -m+J7XWZrJloIAMYM/N1+KwOdU8rryGcnu/HW4KB2QwrIAmY1dxrS3AiJiXWgqZn3 -rWHVjmpQk6PTYCO3EqB4j5vWFHAYDFDi5Lxse1iPo+f+ZcrRDcbWXDRDoz6riYN2 -PfMsB4dH9ajIJBMVZfaCaB3joLRdCSql9j2aZ89nGkqiKUzGWFfjPpPHFhGLBvFk -4H+PCFkwI0yhfHlJgMLcByhGpdZ3fALDDLmWy/xcLfdxB39z5dskgLiHO7iVOPed -0OWm2kmn1I81JSI17xgPSzBIhNf5HW7M7iXostq/DTaP8wCF9WLd0Sl/yW3hkppF -VQcH9c9OxSbFjHuM60PKv7D+U+dkUyEAQIOJARwEEAECAAYFAk6DrGQACgkQ/YT8 -uPW0MEdizQf+LRGpkyYcVnEXiFUUuJiMZlWSoTeFsFlTLdBVjxAlcTanW5PUZ1O+ -fzxhSTjtAgEZm1UJUv3RaJxGlMeOVV+1o6F7xzsaTOFajjAKDwrfP9WdvRyiC5Ir -vdfuJB6THCkgu5l0yoMxANyBXi9lEPHFPllOk6sTjfEk9LlJTn1Quy3c5qb9GJgi -SbA+7sS6AO7woE52TxdAJjxB+PM1dt/FZGG4hjeH3WmjUtfahm1UlBtWLEVleOz4 -EFXwTQErNpHfBaReJecOfJZ/30OGEJNWkNkmrg+ed1uLsE+K2DxEHTFCZd83OPQG -Hpi+qYcv9SDDMYxzzdlynkOn5DoR0z87N4kBHAQTAQIABgUCTOFEywAKCRBOxgcj -KWBud9u6CADAzrlWGzIi/Wp8dPrEbhBEGW2NaLQqEwiH/KwxAQMNEQT2Llzn3DJB -1jT836KIVuqgI3hCvN9QEj1YN3LWuQrZp/5jNnoTt2PlwhLXp02ST/GbR4N6WRLe -D7UGjgba1sal9Yet9yhCGtGu3QEmlOCjmYP0siqAoXEq9qWPo7cw2nLGfKv3rfs8 -9oJLXb3A0pCbq5D45TkcfQnFhYTnezxT+GVp9ANAJLnzKWy14ZVSQpkspMshtA6J -9wvYu7BtOOd9NyjcuggPpY73JvxAXnjFryzHY6+dV5pBhY2gLOC8sNAnyo/bjWXa -4jrUlbR9pHDJjUr3FJZ9gRWUwaNjXkShiQGcBBEBCgAGBQJOqaI/AAoJEKDyE/FG -61gfiUoL/1hjCMeMAGuiB0Haxvj0kiIzYOp74b74aLNVNmyZXbo8ldZAsqvbMpkM -wuTeX9v1gtWS4V4bYrTfkc8UK2lYiXGTGltqsjmL0XQ2MyaBojKq+HXjE2ENLo0e -CKgN00q900jkti1ZcZESNglUIEjB3FZkeLkmxCBXYTS98hkYMpYV8wgXbGu3rHS6 -+FZmcP3h5xTQN3ywXPtMomgJ3N91imiPlE56csYns5wMxQuSdIDg0RUgRjQFXJAJ -vdMKN9ugJHFF1ez7rLPhgSpMLM829Cogoo7owD9ffK2ZSiRFkhWZTx6ziJnFhRes -cp4zOu9hWlvDAfCnOIbAGv5I6StLmK/lzVXU1v6lJqO3MCbi1Cc2jKO8HZiwQ69M -tQ2BpJxjk7te78UaEjoT1jwpsPudva31d20QWAeKrVJPXm2J7Dpg0Jq1UD8Zbev3 -t52IGOoBffmGoVJnTnJo0OUKB8rGtGK/ZIe76G60BftxUtMB62baaskFvSKnuFAq -uZQ6nOJPuIkCHAQQAQIABgUCS2kT4QAKCRDF6XwrY59qZmGmD/4/00+TzyupGcS4 -NUMeh2WQDmEbR3RiLm+RX2vDTvKNi63jvhpR3cWMkWo0SiJb7p0Vs3Lpiqpg+Gtc -u2d8mXksBQlTMwDZpIu1u5f5yrXwMK/lmZTgNbqRk5aLm9ftCRAJNMs/TdWVwPca -7ofKh+x4EyATjOgRd2ZlJmY+c7KBqQUvML3D4PVd8raBxpMqMAkl1bzRpjnp5R7M -UMouE7D5jMgrX9l545NLgt4hO1Orknr+GfAesl2MClfzS/ZYnNVWjLuVBvEA+yUk -dl1hUUIHLZPKTuRh111XFgJx1ivR7wD4Z8b+1AkbG9nc7ic6t7NK/ReaWEtnmuMK -fwzp+D80pRew+1eJpz4NAluvlHBDlJztuc9WwLLCp6054D7G/cvbCL3iuDi73tCL -CqENbRIT3Nm5Avm9peX8YWlpFez6ZUYBNL2H7SUMFA+LbWg+R038EorOv//YYKXl -UVv6uQ5jrke2EK6IitPyMUYCskgXideS7/gE+k2uBqcLz2JOx3n5RQ0UiW1r5ZiQ -Q1D20LabCP3oForQrJFBk/0ADNOjnAbxqi5zOm2nBIfRoQIk3LyR39RHwgCRmTGN -jj7PJ9AOVvho0OxUa96amCMVw2jStyIqs9CXkbJEtCPZrO6/jqBoZxjOqyht6NL/ -aOoksyeRN4TFoKvKta5ej+tpYFZAs4kCHAQQAQIABgUCTJuCrgAKCRDYdHJ+M5p/ -qG4pD/9h97LkElepmoi32Lq3LDZWrMy1nWACoV0Qp65KbPfTG3L2DoqSciOl5mj4 -85vetAVQoZn+rgCNYp0P0LlZS8txd3REJZ4Mbt2YPvyHfk5bCqFz7wVc7W9TScbI -V0THz1w2I7jYz/P55h6jKyBUveLFsKMmWs3gweuKWqyHEfky8bsl8h+g/C5xDK01 -zBJrxP2ROWYL25KXWvASWUqUM1pvEymx/71PSRm0j4pCu8wGDwDhFEmGk/XcG3rL -3j0VtHjO9ruSpXbiH7lz9sqyBjg9dcz4Cci5fL4OrVpFWBEuFbKkmpzvdSekP8wM -M48pfyeQXcXSaNx8Syjoq282yeI8KvkYpye+ga7fyqVDsgubY+/S2MEc0hhA0b3E -+fZMwfvgPp/zw1qEePfcdrs8bwmf91ky4qDuoR4eK3v6UkOfXxxNPzEgwxSmX0Cm -aMu5bCjl5NfKxqLs9BBT97MRs6BirOcEoQUr4Jcfoog2cYfXd3+v0vvUBmP8pmwj -5zsTSKYvBRK28kRmvYz2dH7JsDhI3r+TBwXmfaTH6UEmOoGfvaFvTDJpde1NgUZ1 -6u5ggazETHyKZsgEO1fqtY4witkAeU8FLk1OPgfJ7XhdwKFH8Ch2ZeuAkP/P7z6w -MYZmkcBzb3XCScc776Pba8XjtDZVK3xP5YzpPHy+rT5aye6L+LkBDQRKoO2QAQgA -2uKxSRSKpd2JO1ODUDuxppYacY1JkemxDUEHG31cqCVTuFz4alNyl4I+8pmtX2i+ -YH7W9ew7uGgjRzPEjTOm8/Zz2ue+eQeroveuo0hyFa9Y3CxhNMCE3EH4AufdofuC -mnUf/W7TzyIvzecrwFPlyZhqWnmxEqu8FaR+jXK9Jsx2Zby/EihNoCwQOWtdv3I4 -Oi5KBbglxfxE7PmYgo9DYqTmHxmsnPiUE4FYZG263Ll1ZqkbwW77nwDEl1uh+tjb -Ou+Y1cKwecWbyVIuY1eKOnzVC88ldVSKxzKOGu37My4z65GTByMQfMBnoZ+FZFGY -iCiThj+c8i93DIRzYeOsjQARAQABiQJEBBgBAgAPBQJKoO2QAhsCBQkFo5qAASkJ -EO6MvJ6Ibd2JwF0gBBkBAgAGBQJKoO2QAAoJEHSpQbohnsgQtBEH+QH/xtP9sc9E -MB+fDegsf2aDHLT28YpvhfjLWVrYmXRiextcBRiCwLT6khulhA2vk4Tnh22dbhr8 -7hUtuCJZGR5Y4E2ZS99KfAxXcu96Wo6Ki0X665G/QyUxoFYT9msYZzlv0OmbuIaE -D0p9lRlTlZrsDG969a/d30G8NG0Mv6CH/Sfqtq26eP3ITqHXe1zFveVTMIliBHaW -Gg9JqHiu/mm2MwUxuQAzLmaCtma5LXkGTUHsUruIdHplnqy7DHb3DC8mIjnVj9dv -PrNXv54mxxhTwHkT5EPjFTzGZa6oFavYt+FzwPR67cVQXfz7jh6GktcqxrgA7KUm -UwuaJ+DzGkKqZAgAoh4S9OxVlIPlt7kUC57fozDqmrmj1nyXz6yvlZmWd0OSkV4E -NXIsCKvQ/xinJ36lai3khRhhd8a7duKvZRE0GCnXAkBqpD3ZgaWIBXoO9XOM74mg -A7UA7a/d/0Whld4At+69FlegUT1OzZWRx5Q8/12lM/jWSBLJaP7ZmclfP8mZWiLS -SPann86ANmgSRRymHbYC1qOyCALYXIcVSvH26XOkqKaf/StBr1zP+iI6bux9DTFa -ezxsLhW7Zm8C0dxpMnj5kHqDLOk9cJ/5dOiUiCVW2RnEAu9ndCkK12Oawdofzyr6 -yIJpnL6TsA5uFqUosz2rOPKeeDOtruSo490PTA== -=MGuX +Lm9yZyBhcmNoaXZlIHNpZ25pbmcga2V5iQE8BBMBAgAmAhsDBgsJCAcDAgQVAggD +BBYCAwECHgECF4AFAlA+M24FCQ0iFQAACgkQ7oy8noht3YkZsAf/Z+O15tDvGwLz +NROeMiTyOZ4fyQ1lynUpOS3fUJl3qM30oWPl1tK5pdAZgwleL0Co8d27Hv14zpCO +wwI3htgl7dsD8IS564v1sHGx+X1qfLzInwFxIlVxzrVbhUNeLSKiBJ6qwcZqAIep +eS2Lv+l3lELOvjbHQ4bx5DqoVZn0uUqksh3PkyN9Du4lZ2WGiTm1pIWDxY8kJIgx +pDFEL3e5i/cIQy6wsfeE2Nw2T0qoxn+sWSvwBUijtfq0K41w4jpEsnmjiZQ0l+VT +wcoGlF/oQuEkAV+FXQCLw26a2aPUXizttlPINJ8JiNzl68j8FaMnqkaFAzJffbM8 +D1UOZVdmnbkBDQRKoO2QAQgA2uKxSRSKpd2JO1ODUDuxppYacY1JkemxDUEHG31c +qCVTuFz4alNyl4I+8pmtX2i+YH7W9ew7uGgjRzPEjTOm8/Zz2ue+eQeroveuo0hy +Fa9Y3CxhNMCE3EH4AufdofuCmnUf/W7TzyIvzecrwFPlyZhqWnmxEqu8FaR+jXK9 +Jsx2Zby/EihNoCwQOWtdv3I4Oi5KBbglxfxE7PmYgo9DYqTmHxmsnPiUE4FYZG26 +3Ll1ZqkbwW77nwDEl1uh+tjbOu+Y1cKwecWbyVIuY1eKOnzVC88ldVSKxzKOGu37 +My4z65GTByMQfMBnoZ+FZFGYiCiThj+c8i93DIRzYeOsjQARAQABiQJEBBgBAgAP +AhsCBQJQPjNzBQkJX6zhASnAXSAEGQECAAYFAkqg7ZAACgkQdKlBuiGeyBC0EQf5 +Af/G0/2xz0QwH58N6Cx/ZoMctPbxim+F+MtZWtiZdGJ7G1wFGILAtPqSG6WEDa+T +hOeHbZ1uGvzuFS24IlkZHljgTZlL30p8DFdy73pajoqLRfrrkb9DJTGgVhP2axhn +OW/Q6Zu4hoQPSn2VGVOVmuwMb3r1r93fQbw0bQy/oIf9J+q2rbp4/chOodd7XMW9 +5VMwiWIEdpYaD0moeK7+abYzBTG5ADMuZoK2ZrkteQZNQexSu4h0emWerLsMdvcM +LyYiOdWP128+s1e/nibHGFPAeRPkQ+MVPMZlrqgVq9i34XPA9HrtxVBd/PuOHoaS +1yrGuADspSZTC5on4PMaQgkQ7oy8noht3Yn+Nwf/bLfZW9RUqCQAmw1L5QLfMYb3 +GAIFqx/h34y3MBToEzXqnfSEkZGM1iZtIgO1i3oVOGVlaGaE+wQKhg6zJZ6oTOZ+ +/ufRO/xdmfGHZdlAfUEau/YiLknElEUNAQdUNuMB9TUtmBvh00aYoOjzRoAentTS ++/3p3+iQXK8NPJjQWBNToUVUQiYD9bBCIK/aHhBhmdEc0YfcWyQgd6IL7547BRJb +PDjuOyAfRWLJ17uJMGYqOFTkputmpG8n0dG0yUcUI4MoA8U79iG83EAd5vTS1eJi +Tmc+PLBneknviBEBiSRO4Yu5q4QxksOqYhFYBzOj6HXwgJCczVEZUCnuW7kHww== +=10NR -----END PGP PUBLIC KEY BLOCK----- EOF apt-key add $GPGKEY # Install Tor and arm echo "Installing Tor..."; -aptitude update -aptitude -y install tor tor-geoipdb tor-arm +apt-get update +apt-get -y install tor tor-geoipdb tor-arm deb.torproject.org-keyring # Configure Tor echo "Configuring Tor...";

1 0

[tor/master] Downgrade "EVP ctr128 is ok" message to info
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 7ff5c3f2322217a0fe5d24ba26a0192106594e0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:38:22 2012 -0400 Downgrade "EVP ctr128 is ok" message to info Part of 6736 effort to try to make startup quieter. --- src/common/aes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index dd89d5d..c6a997f 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -134,8 +134,8 @@ int evaluate_evp_for_aes(int force_val) { (void) force_val; - log_notice(LD_CRYPTO, "This version of OpenSSL has a known-good EVP " - "counter-mode implementation. Using it."); + log_info(LD_CRYPTO, "This version of OpenSSL has a known-good EVP " + "counter-mode implementation. Using it."); return 0; } int

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6797'
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6 Merge: 344bb1d 93ee622 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:19:57 2012 -0400 Merge remote-tracking branch 'linus/bug6797' changes/bug6797 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Don't follow the NULL pointer.
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 93ee62297ff24fcd01f97c87d76953f4d5fb377c Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Sep 5 14:00:55 2012 +0200 Don't follow the NULL pointer. If dirvote_create_microdescriptor() returns NULL, don't use md. Found by "f. tp.". Fixes bug 6797. --- changes/bug6797 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6797 b/changes/bug6797 new file mode 100644 index 0000000..f52f899 --- /dev/null +++ b/changes/bug6797 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't follow the NULL pointer. Found by "f. tp.". Fixes bug + 6797; bugfix on 0.2.4.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7f46906..e7a2623 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2800,9 +2800,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, h->microdesc_hash_line = tor_strdup(buf); h->next = vrs->microdesc; vrs->microdesc = h; + md->last_listed = now; + smartlist_add(microdescriptors, md); } - md->last_listed = now; - smartlist_add(microdescriptors, md); } smartlist_add(routerstatuses, vrs);

1 0

[tor/master] Be more clear in changes file for 6797.
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 3e8058f9edb592479d84181343ae8d47bb745d2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:21:46 2012 -0400 Be more clear in changes file for 6797. --- changes/bug6797 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug6797 b/changes/bug6797 index f52f899..95c889d 100644 --- a/changes/bug6797 +++ b/changes/bug6797 @@ -1,3 +1,5 @@ o Minor bugfixes: - - Don't follow the NULL pointer. Found by "f. tp.". Fixes bug - 6797; bugfix on 0.2.4.1-alpha. + - Don't follow the NULL pointer if microdescriptor generation fails. + (This does not appear to be triggerable, but it's best to be safe.) + Found by "f. tp.". Fixes bug 6797; bugfix on 0.2.4.1-alpha. +

1 0