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

[tor/master] make "make test-stem" run stem tests on tor
by nickm＠torproject.org 06 Jan '15

06 Jan '15

commit d74f0cff92322174e19c5cbd98462bd25e14fc3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 5 11:52:36 2015 -0500 make "make test-stem" run stem tests on tor Closes ticket 14107. --- Makefile.am | 9 +++++++++ changes/ticket14107 | 6 ++++++ src/or/include.am | 3 +++ 3 files changed, 18 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3de7f7a..f6a1bcf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,15 @@ test: all test-network: all ./src/test/test-network.sh +test-stem: $(TESTING_TOR_BINARY) + @if test -d "$$STEM_SOURCE_DIR"; then \ + "$$STEM_SOURCE_DIR"/run_tests.py --tor $(TESTING_TOR_BINARY) --all --log notice --target RUN_ALL; \ + else \ + echo '$$STEM_SOURCE_DIR was not set.'; echo; \ + echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \ + fi + + reset-gcov: rm -f src/*/*.gcda diff --git a/changes/ticket14107 b/changes/ticket14107 new file mode 100644 index 0000000..e4ba6be --- /dev/null +++ b/changes/ticket14107 @@ -0,0 +1,6 @@ + o Testing: + + - New "make test-stem" target to run stem integration tests. + Requires that the "STEM_SOURCE_DIR" environment variable be set. + Closes ticket 14107. + diff --git a/src/or/include.am b/src/or/include.am index fb1581c..b44e109 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,6 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ +TESTING_TOR_BINARY = ./src/or/tor-cov +else +TESTING_TOR_BINARY = ./src/or/tor endif ORHEADERS = \

1 0

[meek/master] Typo.
by dcf＠torproject.org 06 Jan '15

06 Jan '15

commit 9c70604c81a08c8648b60fd08e8b9dd41db252c4 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 23:12:00 2015 -0800 Typo. --- nginx/nginx.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/nginx.conf.example b/nginx/nginx.conf.example index 0f0b4db..4ed239c 100644 --- a/nginx/nginx.conf.example +++ b/nginx/nginx.conf.example @@ -42,7 +42,7 @@ server { # This is where the magic happens location / { - # Proxy traffic all traffic received with the meek Host to + # Proxy all traffic received with the meek Host to # a meek-server instance. proxy_pass http://meek.bamsoftware.com:7002;

1 0

[tor-browser-bundle/master] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit bf363a746eeb3a5e7243f573a5ffeda93a31aa9f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit 8df1fb275aa6427f4af9c683e06d4ad4c0c07727 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 06 Jan '15

06 Jan '15

commit caa6c90e3e9fb0cc0435e58b1c2b2684ba04958b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 5 23:45:23 2015 +0000 Update translations for liveusb-creator_completed --- el/el.po | 60 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/el/el.po b/el/el.po index 55e4c03..12b4e98 100644 --- a/el/el.po +++ b/el/el.po @@ -4,6 +4,7 @@ # # Translators: # Adrian Pappas <pappasadrian(a)gmail.com>, 2013 +# catopsi <catopsi(a)hotmail.com>, 2015 # firespin <dartworldgr(a)hotmail.com>, 2014 # dpdt1 <dpdt1(a)espiv.net>, 2013 # anvo <fragos.george(a)hotmail.com>, 2012 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:56+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-12-01 18:01+0100\n" +"PO-Revision-Date: 2015-01-05 23:30+0000\n" +"Last-Translator: catopsi <catopsi(a)hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +48,7 @@ msgstr "%(size)s %(label)s" msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" msgstr "%s ήδη επανεκκινήσιμο" @@ -104,12 +105,12 @@ msgid "" "persist after a reboot." msgstr "Με την κατανομή του επιπλέον χώρου στο USB stick για μόνιμο, θα είστε σε θέση να αποθηκεύσετε τα δεδομένα και να κανετε συνεχης τροποποιήσεις στο λειτουργικό σας σύστημα. Χωρίς αυτό, δεν θα είστε σε θέση να αποθηκεύσετε τα δεδομένα που θα διατηρούνται μετά από επανεκκίνηση. " -#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Υπολογισμός του SHA1 για το %s" -#: ../liveusb/creator.py:1357 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "Αδυναμία εύρεσης" @@ -160,7 +161,7 @@ msgstr "Η λήψη απέτυχε:" msgid "Downloading %s..." msgstr "Γίνεται λήψη %s..." -#: ../liveusb/creator.py:1142 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "Η συσκευή είναι μια ανακύκλωση. Παρακάμπτεται η επαναφορά του MBR" @@ -169,7 +170,7 @@ msgstr "Η συσκευή είναι μια ανακύκλωση. Παρακάμ msgid "Entering unmount_device for '%(device)s'" msgstr "Εισαγωγή unmount_device για '%(device)s'" -#: ../liveusb/creator.py:1222 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "Σφάλμα κατά τον έλεγχο της συσκευής" @@ -189,7 +190,7 @@ msgstr "Σφάλμα: Το SHA1 του Live CD σας δεν είναι έγκυ msgid "Extracting live image to the target device..." msgstr "Εξαγωγή ζωντανής εικόνας στην επιλεγμένη συσκευή..." -#: ../liveusb/creator.py:1090 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Η συσκευή %(device)s διαμορφώνεται ως FAT32" @@ -225,7 +226,7 @@ msgstr "Η εγκατάσταση ολοκληρώθηκε! (%s)" msgid "Installation was completed. Press OK to close this program." msgstr "Η εγκατάσταση έχει ολοκληρωθεί. Πιέστε το OK για να κλείσετε αυτό το πρόγραμμα." -#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "Εγκατάσταση bootloader..." @@ -233,13 +234,13 @@ msgstr "Εγκατάσταση bootloader..." msgid "LiveUSB creation failed!" msgstr "Η δημιουργία LiveUSB απέτυχε!" -#: ../liveusb/creator.py:1358 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Πριν εκτελέσετε το πρόγραμμα αυτό, βεβαιωθείτε ότι εξαγάγατε το συμπιεσμένο αρχείο του liveusb-creator." -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Σιγουρευτείτε ότι το USB stick σας είναι συνδεδεμένο και διαμορφωμένο σε σύστημα αρχείων FAT" @@ -259,8 +260,11 @@ msgid "No mount points found" msgstr "Δεν βρέθηκαν σημεία προσάρτησης" #: ../liveusb/creator.py:401 -msgid "Not enough free space on device." -msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος στη συσκευή." +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Δέν υπάρχει αρκετά ελεύθερος χώρος στην συσκευή \n%dMB ISO + %dMB overlay > %dMB ελεύθερος χώρος" #: ../liveusb/gui.py:538 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -295,7 +299,7 @@ msgstr "Ανανεωση..." msgid "Releases updated!" msgstr "Η ανανεωση πετυχε!" -#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "Απομακρύνονται τα %(file)s" @@ -304,7 +308,7 @@ msgstr "Απομακρύνονται τα %(file)s" msgid "Removing existing Live OS" msgstr "Αφαίρεση υπάρχοντος Live Λειτουργικού" -#: ../liveusb/creator.py:1136 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Επαναφορά Master Boot Record στο %s" @@ -329,7 +333,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Ο τύπος της πηγής δεν επιτρέπει επαλήθευση του MD5 αθροίσματος ελέγχου του ISO, παράκαμψη" -#: ../liveusb/creator.py:1170 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "Γίνεται συγχρονισμός των δεδομένων δίσκου..." @@ -381,11 +385,11 @@ msgstr "Αυτή είναι η γραμμή προόδου που θα δείχ msgid "This is the status console, where all messages get written to." msgstr "Αυτή είναι η κονσόλα κατάστασης, όπου γράφονται όλα τα μηνύματα." -#: ../liveusb/creator.py:910 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." msgstr "Προσπάθεια να συνεχίσετε ούτως ή άλλως." -#: ../liveusb/creator.py:942 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Αδυναμία αλλαγής της ετικέτας του τόμου: %(message)s" @@ -404,15 +408,15 @@ msgstr "Αδυναμία αντιγραφής %(infile)s στο %(outfile)s: %(m msgid "Unable to find any USB drive" msgstr "Αδυναμία εύρεσης δίσκου USB" -#: ../liveusb/creator.py:1224 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "Δεν βρέθηκε συμβατή συσκευή" -#: ../liveusb/creator.py:1067 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "Αδυναμία εντοπισμού διαμερίσματος" -#: ../liveusb/creator.py:1304 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Αδυναμία λήψης του Win32_LogicalDisk· η αναζήτηση του win32com δεν απέδωσε αποτελέσματα" @@ -436,7 +440,7 @@ msgstr "Αδυναμία απομάκρυνσης καταλόγου από πρ msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Αδυναμία απομάκρυνσης αρχείου από προηγούμενο LiveOS: %(message)s" -#: ../liveusb/creator.py:1139 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Αδυναμία επαναφοράς του MBR. Ίσως δεν έχετε εγκατεστημένο το πακέτο `syslinux`." @@ -461,7 +465,7 @@ msgstr "Άγνωστο ISO, παράκαμψη επαλήθευσης αθροί msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Άγνωστη εξαίρεση dbus κατά την προσπάθεια προσάρτησης της συσκευής: %(message)s" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:921 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Άγνωστο σύστημα αρχείων. Η συσκευή μπορεί να χρειάζεται διαμόρφωση." @@ -480,12 +484,12 @@ msgstr "Αποπροσάρτηση '%(udi)s' σε '%(device)s'" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Αποπροσάρτηση προσαρτημένων συστημάτων αρχείων σε '%(device)s'" -#: ../liveusb/creator.py:907 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Μη υποστηριζόμενη συσκευή '%(device)s', παρακαλούμε να αναφέρετε το σφάλμα." -#: ../liveusb/creator.py:784 ../liveusb/creator.py:924 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "Μη υποστηριζόμενο σύστημα αρχείων: %s" @@ -497,7 +501,7 @@ msgid "" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Μη υποστηριζόμενο σύστημα αρχείων: %s Στην περίπτωση που επιχειρείτε μια μη αυτόματη εγκατάσταση του συστήματος Tails (δηλαδή, αν έχει εγκατασταθεί χωρίς αυτό τον εγκαταστάτη), η επιλογή αυτή δεν υποστηρίζεται: θα πρέπει να το εγκαταστήσετε εκ νέου, π.χ. επιλέγοντας την ενέργεια \"Clone Tails\"." -#: ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -529,7 +533,7 @@ msgstr "Επαληθεύεται το SHA1 άθροισμα ελέγχου τη msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Επαληθεύεται το SHA256 άθροισμα ελέγχου της εικόνας του LiveCD..." -#: ../liveusb/creator.py:918 ../liveusb/creator.py:1230 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr "Επιβεβαίωση συστήματος αρχείων..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 06 Jan '15

06 Jan '15

commit 7e533ff194785db107a7d63f0d8a665233f7780c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 5 23:45:16 2015 +0000 Update translations for liveusb-creator --- el/el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/el/el.po b/el/el.po index 9171381..12b4e98 100644 --- a/el/el.po +++ b/el/el.po @@ -4,6 +4,7 @@ # # Translators: # Adrian Pappas <pappasadrian(a)gmail.com>, 2013 +# catopsi <catopsi(a)hotmail.com>, 2015 # firespin <dartworldgr(a)hotmail.com>, 2014 # dpdt1 <dpdt1(a)espiv.net>, 2013 # anvo <fragos.george(a)hotmail.com>, 2012 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-01 18:01+0100\n" -"PO-Revision-Date: 2014-12-03 08:43+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-05 23:30+0000\n" +"Last-Translator: catopsi <catopsi(a)hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -263,7 +264,7 @@ msgstr "Δεν βρέθηκαν σημεία προσάρτησης" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Δέν υπάρχει αρκετά ελεύθερος χώρος στην συσκευή \n%dMB ISO + %dMB overlay > %dMB ελεύθερος χώρος" #: ../liveusb/gui.py:538 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[tor-messenger-build/master] instantbird: don't use get-pip.py to install pip
by boklm＠torproject.org 05 Jan '15

05 Jan '15

commit f092d067310508e9a7bd3ebb3a4924c23c04b855 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 5 21:35:52 2015 +0100 instantbird: don't use get-pip.py to install pip The mozilla build will install pip, so we don't need to install it. --- projects/instantbird/build | 1 - projects/instantbird/config | 3 --- 2 files changed, 4 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index c1e3147..a486868 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -9,7 +9,6 @@ cd /tmp/dist [% IF c("var/linux") -%] tar xf $rootdir/[% c('input_files_by_name/python') %] export PATH="/tmp/dist/python/bin:$PATH" -python $rootdir/get-pip.py tar xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/tmp/dist/binutils/bin:$PATH" [% END -%] diff --git a/projects/instantbird/config b/projects/instantbird/config index cbae1a1..dfd0154 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -79,9 +79,6 @@ input_files: - name: python project: python enable: '[% c("var/linux") %]' - - URL: https://bootstrap.pypa.io/get-pip.py - sha256sum: 3a96e070032aa850ca154844c2be89bbe72cc58040453aac3efdab7b4c4c7144 - enable: '[% c("var/linux") %]' - name: binutils project: binutils enable: '[% c("var/linux") %]'

1 0

[tor-messenger-build/master] Remove upstreamed patches
by arlo＠torproject.org 05 Jan '15

05 Jan '15

commit 3b5da55f65f6ac0dc4bc348240e4b3897860e4f9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jan 5 11:50:34 2015 -0800 Remove upstreamed patches * These were merged in, https://hg.mozilla.org/comm-central/rev/90bc651566be https://hg.mozilla.org/comm-central/rev/d6f2f1a42c74 https://hg.mozilla.org/users/florian_queze.net/purple/rev/d44192a91176 --- projects/instantbird/config | 2 - .../prepare-messages-for-displaying.patch | 288 --------------- projects/instantbird/test-transformation-api.patch | 367 -------------------- 3 files changed, 657 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 66a2a99..cbae1a1 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -58,8 +58,6 @@ input_files: pkg_type: src - filename: spi-cacert.der - filename: preferences.patch - - filename: prepare-messages-for-displaying.patch - - filename: test-transformation-api.patch - filename: slashme.patch - filename: irc.patch - filename: xmpp.patch diff --git a/projects/instantbird/prepare-messages-for-displaying.patch b/projects/instantbird/prepare-messages-for-displaying.patch deleted file mode 100644 index c9dc42b..0000000 --- a/projects/instantbird/prepare-messages-for-displaying.patch +++ /dev/null @@ -1,288 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra(a)gmail.com> -# Date 1417196598 28800 -# Fri Nov 28 09:43:18 2014 -0800 -# Node ID ddcfdad3c07c6304ce3de53f38ba0adec98ea53a -# Parent 523fa3fa1fd619423f7267fdd2b3b215bcb93d1b -Prepare messages for displaying - - * Adds a converse method to prepareForSending. - -Bug: 1071166 - -diff --git a/chat/components/public/imIConversationsService.idl b/chat/components/public/imIConversationsService.idl ---- a/chat/components/public/imIConversationsService.idl -+++ b/chat/components/public/imIConversationsService.idl -@@ -64,16 +64,21 @@ interface imIConversationsService: nsISu - - nsISimpleEnumerator getConversations(); - prplIConversation getConversationById(in unsigned long aId); - prplIConversation getConversationByNameAndAccount(in AUTF8String aName, - in imIAccount aAccount, - in boolean aIsChat); - }; - -+// Because of limitations in libpurple (write_conv is called without context), -+// there's an implicit contract that whatever message string the conversation -+// service passes to a protocol, it'll get back as the originalMessage when -+// "new-text" is notified. This is required for the OTR extensions to work. -+ - // A cancellable outgoing message. Before handing a message off to a protocol, - // the conversation service notifies observers (typically add-ons) of an - // outgoing message, which can be transformed or cancelled. - [scriptable, uuid(4391ba5c-9566-41a9-bb9b-fd0a0a490c2c)] - interface imIOutgoingMessage: nsISupports { - attribute AUTF8String message; - attribute boolean cancelled; - readonly attribute prplIConversation conversation; -diff --git a/chat/components/public/prplIConversation.idl b/chat/components/public/prplIConversation.idl ---- a/chat/components/public/prplIConversation.idl -+++ b/chat/components/public/prplIConversation.idl -@@ -5,16 +5,17 @@ - - #include "nsISupports.idl" - #include "nsISimpleEnumerator.idl" - #include "nsIObserver.idl" - - interface prplIAccountBuddy; - interface imIAccount; - interface imIOutgoingMessage; -+interface imIMessage; - interface nsIURI; - interface nsIDOMDocument; - interface prplIChatRoomFieldValues; - - /* - * This is the XPCOM purple conversation component, a proxy for PurpleConversation. - */ - -@@ -47,16 +48,21 @@ interface prplIConversation: nsISupports - void sendMsg(in AUTF8String aMsg); - - /* Preprocess messages before they are sent (eg. split long messages). - Can return null if no changes are to be made. */ - void prepareForSending(in imIOutgoingMessage aMsg, - [optional] out unsigned long aMsgCount, - [retval, array, size_is(aMsgCount)] out wstring aMsgs); - -+ /* Postprocess messages before they are displayed (eg. escaping). The -+ implementation can set aMsg.displayMessage, otherwise the originalMessage -+ is used. */ -+ void prepareForDisplaying(in imIMessage aMsg); -+ - /* Send information about the current typing state to the server. - aString should contain the content currently in the text field. The - protocol should return the number of characters that can still be typed. */ - long sendTyping(in AUTF8String aString); - const long NO_TYPING_LIMIT = 2147483647; // max int = 2 ^ 31 - 1 - - /* Un-initialize the conversation. Will be called by - purpleCoreService::RemoveConversation when the conversation is -diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js ---- a/chat/components/src/imConversations.js -+++ b/chat/components/src/imConversations.js -@@ -403,16 +403,17 @@ UIConversation.prototype = { - this._observers = this._observers.filter(function(o) o !== aObserver); - }, - notifyObservers: function(aSubject, aTopic, aData) { - if (aTopic == "new-text") { - aSubject = new imMessage(aSubject); - this.notifyObservers(aSubject, "received-message"); - if (aSubject.cancelled) - return; -+ aSubject.conversation.prepareForDisplaying(aSubject); - - this._messages.push(aSubject); - ++this._unreadMessageCount; - if (aSubject.incoming && !aSubject.system) { - ++this._unreadIncomingMessageCount; - if (!this.isChat || aSubject.containsNick) - ++this._unreadTargetedMessageCount; - } -@@ -430,16 +431,21 @@ UIConversation.prototype = { - if (aSubject.incoming && !aSubject.system && - (!this.isChat || aSubject.containsNick)) { - this.notifyObservers(aSubject, "new-directed-incoming-message", aData); - Services.obs.notifyObservers(aSubject, "new-directed-incoming-message", aData); - } - } - }, - -+ // Used above when notifying of new-texts originating in the -+ // UIConversation. The happens when this.systemMessage() is called. The -+ // conversation for the message is set as the UIConversation. -+ prepareForDisplaying: function(aMsg) {}, -+ - // prplIConvIM - get buddy() this.target.buddy, - get typingState() this.target.typingState, - sendTyping: function(aString) this.target.sendTyping(aString), - - // Chat only - getParticipants: function() this.target.getParticipants(), - get topic() this.target.topic, -diff --git a/chat/modules/jsProtoHelper.jsm b/chat/modules/jsProtoHelper.jsm ---- a/chat/modules/jsProtoHelper.jsm -+++ b/chat/modules/jsProtoHelper.jsm -@@ -477,16 +477,17 @@ const GenericConversationPrototype = { - observer.observe(aSubject, aTopic, aData); - } catch(e) { - this.ERROR(e); - } - } - }, - - prepareForSending: function(aOutgoingMessage, aCount) null, -+ prepareForDisplaying: function(aImMessage) {}, - sendMsg: function(aMsg) { - throw Cr.NS_ERROR_NOT_IMPLEMENTED; - }, - sendTyping: function(aString) Ci.prplIConversation.NO_TYPING_LIMIT, - - close: function() { - Services.obs.notifyObservers(this, "closing-conversation", null); - Services.conversations.removeConversation(this); -diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js ---- a/chat/protocols/irc/irc.js -+++ b/chat/protocols/irc/irc.js -@@ -126,16 +126,20 @@ const GenericIRCConversation = { - getMaxMessageLength: function() { - // Build the shortest possible message that could be sent to other users. - let baseMessage = ":" + this._account._nickname + this._account.prefix + - " " + this._account.buildMessage("PRIVMSG", this.name) + - " :\r\n"; - return this._account.maxMessageLength - - this._account.countBytes(baseMessage); - }, -+ // Apply CTCP formatting before displaying. -+ prepareForDisplaying: function(aMsg) { -+ aMsg.displayMessage = ctcpFormatToHTML(aMsg.displayMessage); -+ }, - prepareForSending: function(aOutgoingMessage, aCount) { - // Split the message by line breaks and send each one individually. - let messages = aOutgoingMessage.message.split(/[\r\n]+/); - - let maxLength = this.getMaxMessageLength(); - - // Attempt to smartly split a string into multiple lines (based on the - // maximum number of characters the message can contain). -@@ -274,24 +278,16 @@ ircChannel.prototype = { - _receivedInitialMode: false, - // For IRC you're not in a channel until the JOIN command is received, open - // all channels (initially) as left. - _left: true, - // True while we are rejoining a channel previously parted by the user. - _rejoined: false, - banMasks: [], - -- // Overwrite the writeMessage function to apply CTCP formatting before -- // display. -- writeMessage: function(aWho, aText, aProperties) { -- GenericConvChatPrototype.writeMessage.call(this, aWho, -- ctcpFormatToHTML(aText), -- aProperties); -- }, -- - // Section 3.2.2 of RFC 2812. - part: function(aMessage) { - let params = [this.name]; - - // If a valid message was given, use it as the part message. - // Otherwise, fall back to the default part message, if it exists. - let msg = aMessage || this._account.getString("partmsg"); - if (msg) -@@ -595,24 +591,16 @@ function ircConversation(aAccount, aName - // Always request the info as it may be out of date. - this._waitingForNick = true; - this.requestBuddyInfo(aName); - } - ircConversation.prototype = { - __proto__: GenericConvIMPrototype, - get buddy() this._account.buddies.get(this.name), - -- // Overwrite the writeMessage function to apply CTCP formatting before -- // display. -- writeMessage: function(aWho, aText, aProperties) { -- GenericConvIMPrototype.writeMessage.call(this, aWho, -- ctcpFormatToHTML(aText), -- aProperties); -- }, -- - unInit: function() { - this.unInitIRCConversation(); - GenericConvIMPrototype.unInit.call(this); - }, - - updateNick: function(aNewNick) { - this._name = aNewNick; - this.notifyObservers(null, "update-conv-title"); -diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm ---- a/chat/protocols/xmpp/xmpp.jsm -+++ b/chat/protocols/xmpp/xmpp.jsm -@@ -32,16 +32,21 @@ XPCOMUtils.defineLazyServiceGetter(this, - XPCOMUtils.defineLazyServiceGetter(this, "UuidGenerator", - "@mozilla.org/uuid-generator;1", - "nsIUUIDGenerator"); - - XPCOMUtils.defineLazyGetter(this, "_", function() - l10nHelper("chrome://chat/locale/xmpp.properties") - ); - -+XPCOMUtils.defineLazyGetter(this, "TXTToHTML", function() { -+ let cs = Cc["@mozilla.org/txttohtmlconv;1"].getService(Ci.mozITXTToHTMLConv); -+ return function(aTxt) cs.scanTXT(aTxt, cs.kEntities); -+}); -+ - /* This is an ordered list, used to determine chat buddy flags: - * index < member -> noFlags - * index = member -> voiced - * moderator -> halfOp - * admin -> op - * owner -> founder - */ - const kRoles = ["outcast", "visitor", "participant", "member", "moderator", -@@ -255,16 +260,23 @@ const XMPPConversationPrototype = { - who = this._account._connection._jid.jid; - if (!who) - who = this._account.name; - let alias = this.account.alias || this.account.statusInfo.displayName; - this.writeMessage(who, aMsg, {outgoing: true, _alias: alias}); - delete this._typingState; - }, - -+ /* Perform entity escaping before displaying the message. We assume incoming -+ messages have already been escaped, and will otherwise be filtered. */ -+ prepareForDisplaying: function(aMsg) { -+ if (aMsg.outgoing && !aMsg.system) -+ aMsg.displayMessage = TXTToHTML(aMsg.displayMessage); -+ }, -+ - /* Called by the account when a messsage is received from the buddy */ - incomingMessage: function(aMsg, aStanza, aDate) { - let from = aStanza.attributes["from"]; - this._targetResource = this._account._parseJID(from).resource; - let flags = {}; - if (aStanza.attributes["type"] == "error") { - aMsg = _("conversation.error.notDelivered", aMsg); - flags.system = true; -@@ -889,19 +901,17 @@ const XMPPAccountPrototype = { - // Prefer HTML (in <html><body>) and use plain text (<body>) as fallback. - let htmlBody = aStanza.getElement(["html", "body"]); - if (htmlBody) - body = htmlBody.innerXML; - else { - // Even if the message is in plain text, the prplIMessage - // should contain a string that's correctly escaped for - // insertion in an HTML document. -- body = Cc["@mozilla.org/txttohtmlconv;1"] -- .getService(Ci.mozITXTToHTMLConv) -- .scanTXT(b.innerText, Ci.mozITXTToHTMLConv.kEntities); -+ body = TXTToHTML(b.innerText); - } - } - if (body) { - let date; - let delay = aStanza.getElement(["delay"]); - if (delay && delay.uri == Stanza.NS.delay) { - if (delay.attributes["stamp"]) - date = new Date(delay.attributes["stamp"]); diff --git a/projects/instantbird/test-transformation-api.patch b/projects/instantbird/test-transformation-api.patch deleted file mode 100644 index f43fcbc..0000000 --- a/projects/instantbird/test-transformation-api.patch +++ /dev/null @@ -1,367 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra(a)gmail.com> -# Date 1414370632 25200 -# Sun Oct 26 17:43:52 2014 -0700 -# Node ID 49fc79e39b9c292d182a46aa800135bd65b6c38f -# Parent 030063bcb41284997f862b9b2d12e93bfc0b121a -Add tests for new messaging pipeline - - * Tests for bugs 1071166, 1088772, and 983347. - -diff --git a/chat/components/public/imIConversationsService.idl b/chat/components/public/imIConversationsService.idl ---- a/chat/components/public/imIConversationsService.idl -+++ b/chat/components/public/imIConversationsService.idl -@@ -70,29 +70,31 @@ interface imIConversationsService: nsISu - }; - - // Because of limitations in libpurple (write_conv is called without context), - // there's an implicit contract that whatever message string the conversation - // service passes to a protocol, it'll get back as the originalMessage when - // "new-text" is notified. This is required for the OTR extensions to work. - - // A cancellable outgoing message. Before handing a message off to a protocol, --// the conversation service notifies observers (typically add-ons) of an --// outgoing message, which can be transformed or cancelled. -+// the conversation service notifies observers of `preparing-message` and -+// `sending-message` (typically add-ons) of an outgoing message, which can be -+// transformed or cancelled. - [scriptable, uuid(4391ba5c-9566-41a9-bb9b-fd0a0a490c2c)] - interface imIOutgoingMessage: nsISupports { - attribute AUTF8String message; - attribute boolean cancelled; - readonly attribute prplIConversation conversation; - }; - - // A cancellable message to be displayed. When the conversation service is --// notified of a new-text (ie. an incoming or outgoing message to be displayed), --// it in turn notifies observers (again, typically add-ons), which have the --// opportunity to swap or cancel the message. -+// notified of a `new-text` (ie. an incoming or outgoing message to be -+// displayed), it in turn notifies observers of `received-message` -+// (again, typically add-ons), which have the opportunity to swap or cancel -+// the message. - [scriptable, uuid(3f88cc5c-6940-4eb5-a576-c65770f49ce9)] - interface imIMessage: prplIMessage { - attribute boolean cancelled; - // Holds the sender color for Chats. - // Empty string by default, it is set by the conversation binding. - attribute AUTF8String color; - - // What eventually gets shown to the user. -diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js ---- a/chat/components/src/imConversations.js -+++ b/chat/components/src/imConversations.js -@@ -59,16 +59,17 @@ imMessage.prototype = { - get containsNick() this.prplMessage.containsNick, - get noLog() this.prplMessage.noLog, - get error() this.prplMessage.error, - get delayed() this.prplMessage.delayed, - get noFormat() this.prplMessage.noFormat, - get containsImages() this.prplMessage.containsImages, - get notification() this.prplMessage.notification, - get noLinkification() this.prplMessage.noLinkification, -+ get originalMessage() this.prplMessage.originalMessage, - getActions: function(aCount) this.prplMessage.getActions(aCount || {}) - }; - - function UIConversation(aPrplConversation) - { - this._prplConv = {}; - this.id = ++gLastUIConvId; - this._observers = []; -@@ -120,17 +121,21 @@ UIConversation.prototype = { - _currentTargetId: 0, - changeTargetTo: function(aPrplConversation) { - let id = aPrplConversation.id; - if (this._currentTargetId == id) - return; - - if (!(id in this._prplConv)) { - this._prplConv[id] = aPrplConversation; -- aPrplConversation.addObserver(this.observeConv.bind(this, id)); -+ // Pass an object here, instead of just a function, because coercion -+ // to an nsIObserver won't happen in the JS tests. -+ aPrplConversation.addObserver({ -+ observe: this.observeConv.bind(this, id) -+ }); - } - - let shouldNotify = this._currentTargetId; - this._currentTargetId = id; - if (!this.isChat) { - let buddy = this.buddy; - if (buddy) - ({statusType: this.statusType, statusText: this.statusText}) = buddy; -@@ -356,17 +361,17 @@ UIConversation.prototype = { - - // Protocols have an opportunity here to preprocess messages before they are - // sent (eg. split long messages). If a message is split here, the split - // will be visible in the UI. - let messages = this.target.prepareForSending(om); - - // Protocols can return null if they don't need to make any changes. - // (nb. passing null with retval array results in an empty array) -- if (!messages.length) -+ if (!messages || !messages.length) - messages = [om.message]; - - for (let msg of messages) { - // Add-ons (eg. OTR) have an opportunity to tweak or cancel the message - // at this point. - om = new OutgoingMessage(msg, this.target); - this.notifyObservers(om, "sending-message"); - if (om.cancelled) -diff --git a/chat/components/src/test/test_conversations.js b/chat/components/src/test/test_conversations.js -new file mode 100644 ---- /dev/null -+++ b/chat/components/src/test/test_conversations.js -@@ -0,0 +1,235 @@ -+/* Any copyright is dedicated to the Public Domain. -+ * http://creativecommons.org/publicdomain/zero/1.0/ */ -+ -+const Cu = Components.utils; -+Cu.import("resource:///modules/imServices.jsm"); -+Cu.import("resource:///modules/jsProtoHelper.jsm"); -+ -+let imConversations = {}; -+Services.scriptloader.loadSubScript( -+ "resource:///components/imConversations.js", imConversations -+); -+ -+// Fake prplConversation -+let _id = 0; -+function Conversation(aName) { -+ this._name = aName; -+ this._observers = []; -+ this._date = Date.now() * 1000; -+ this.id = ++_id; -+} -+Conversation.prototype = { -+ __proto__: GenericConvIMPrototype, -+ _account: { -+ imAccount: { -+ protocol: {name: "Fake Protocol"}, -+ alias: "", -+ name: "Fake Account" -+ }, -+ ERROR: function(e) {throw e;} -+ } -+}; -+ -+// Ensure that when iMsg.message is set to a message (including the empty -+// string), it returns that message. If not, it should return the original -+// message. This prevents regressions due to JS coercions. -+let test_null_message = function() { -+ let originalMessage = "Hi!"; -+ let pMsg = new Message("buddy", originalMessage, { -+ outgoing: true, _alias: "buddy", time: Date.now() -+ }); -+ let iMsg = new imConversations.imMessage(pMsg); -+ equal(iMsg.message, originalMessage); -+ // Setting the message should prevent a fallback to the original. -+ iMsg.message = ""; -+ equal(iMsg.message, ""); -+ equal(iMsg.originalMessage, originalMessage); -+}; -+ -+// ROT13, used as an example transformation. -+function rot13(aString) { -+ return aString.replace(/[a-zA-Z]/g, function(c) { -+ return String.fromCharCode(c.charCodeAt(0) + (c.toLowerCase() < "n" ? 1 : -1) * 13); -+ }); -+} -+ -+// A test that exercises the message transformation pipeline. -+// -+// From the sending users perspective, this looks like: -+// -> UIConv sendMsg -+// -> UIConv notifyObservers `preparing-message` -+// -> protocol prepareForSending -+// -> UIConv notifyObservers `sending-message` -+// -> protocol sendMsg -+// -> protocol writeMessage -+// -> protocol notifyObservers `new-text` -+// -> UIConv notifyObservers `received-message` -+// -> protocol prepareForDisplaying -+// -> UIConv notifyObservers `new-text` -+// -+// From the receiving users perspective, they get: -+// -> protocol writeMessage -+// -> protocol notifyObservers `new-text` -+// -> UIConv notifyObservers `received-message` -+// -> protocol prepareForDisplaying -+// -> UIConv notifyObservers `new-text` -+// -+// The test walks the sending path, which covers both. -+let test_message_transformation = function() { -+ let conv = new Conversation(); -+ conv.sendMsg = function(aMsg) { -+ this.writeMessage("user", aMsg, {outgoing: true}); -+ }; -+ -+ let uiConv = new imConversations.UIConversation(conv); -+ let message = "Hello!"; -+ let receivedMsg = false, newTxt = false; -+ -+ uiConv.addObserver({ -+ observe: function(aObject, aTopic, aMsg) { -+ switch(aTopic) { -+ case "sending-message": -+ ok(!newTxt); -+ ok(!receivedMsg); -+ ok(aObject instanceof imConversations.OutgoingMessage); -+ aObject.message = rot13(aObject.message); -+ break; -+ case "received-message": -+ ok(!newTxt); -+ ok(!receivedMsg); -+ ok(aObject.outgoing); -+ ok(aObject instanceof imConversations.imMessage); -+ equal(aObject.displayMessage, rot13(message)); -+ aObject.displayMessage = rot13(aObject.displayMessage); -+ receivedMsg = true; -+ break; -+ case "new-text": -+ ok(!newTxt); -+ ok(receivedMsg); -+ ok(aObject.outgoing); -+ ok(aObject instanceof imConversations.imMessage); -+ equal(aObject.displayMessage, message); -+ newTxt = true; -+ break; -+ } -+ } -+ }); -+ uiConv.sendMsg(message); -+ -+ ok(newTxt); -+}; -+ -+// A test that cancels a message before it can be sent. -+let test_cancel_send_message = function() { -+ let conv = new Conversation(); -+ conv.sendMsg = function(aMsg) { -+ ok(false); -+ }; -+ -+ let uiConv = new imConversations.UIConversation(conv); -+ uiConv.addObserver({ -+ observe: function(aObject, aTopic, aMsg) { -+ if (aTopic === "sending-message") { -+ ok(aObject instanceof imConversations.OutgoingMessage); -+ aObject.cancelled = true; -+ } -+ } -+ }); -+ uiConv.sendMsg("Hi!"); -+}; -+ -+// A test that cancels a message before it gets displayed. -+let test_cancel_display_message = function() { -+ let conv = new Conversation(); -+ conv.sendMsg = function(aMsg) { -+ this.writeMessage("user", aMsg, {outgoing: true}); -+ }; -+ -+ let uiConv = new imConversations.UIConversation(conv); -+ uiConv.addObserver({ -+ observe: function(aObject, aTopic, aMsg) { -+ switch(aTopic) { -+ case "received-message": -+ ok(aObject instanceof imConversations.imMessage); -+ aObject.cancelled = true; -+ break; -+ case "new-text": -+ ok(false); -+ break; -+ } -+ } -+ }); -+ uiConv.sendMsg("Hi!"); -+}; -+ -+// A test that ensures protocols get a chance to prepare a message before -+// sending and displaying. -+let test_prpl_message_prep = function() { -+ let conv = new Conversation(); -+ conv.sendMsg = function(aMsg) { -+ this.writeMessage("user", aMsg, {outgoing: true}); -+ }; -+ -+ let msg = "Hi!"; -+ let prefix = "test> "; -+ -+ let prepared = false; -+ conv.prepareForSending = function(aMsg) { -+ ok(aMsg instanceof imConversations.OutgoingMessage); -+ equal(aMsg.message, msg); -+ aMsg.message = prefix + aMsg.message; -+ prepared = true; -+ }; -+ -+ conv.prepareForDisplaying = function(aMsg) { -+ ok(aMsg instanceof imConversations.imMessage); -+ equal(aMsg.displayMessage, prefix + msg); -+ aMsg.displayMessage = aMsg.displayMessage.slice(prefix.length); -+ }; -+ -+ let receivedMsg = false; -+ let uiConv = new imConversations.UIConversation(conv); -+ uiConv.addObserver({ -+ observe: function(aObject, aTopic, aMsg) { -+ if (aTopic === "new-text") { -+ equal(aObject.displayMessage, msg); -+ receivedMsg = true; -+ } -+ } -+ }); -+ uiConv.sendMsg(msg); -+ ok(prepared); -+ ok(receivedMsg); -+}; -+ -+// A test that ensures protocols can split messages before they are sent. -+let test_split_message_before_sending = function() { -+ let msgCount = 0; -+ let prepared = false; -+ -+ let conv = new Conversation(); -+ conv.sendMsg = function(aMsg) { -+ ++msgCount; -+ }; -+ conv.prepareForSending = function(aMsg) { -+ ok(aMsg instanceof imConversations.OutgoingMessage); -+ prepared = true; -+ return aMsg.message.split("\n"); -+ }; -+ -+ let uiConv = new imConversations.UIConversation(conv); -+ uiConv.sendMsg("This is a looo\nooong message."); -+ -+ ok(prepared); -+ equal(msgCount, 2); -+}; -+ -+function run_test() { -+ test_null_message(); -+ test_message_transformation(); -+ test_cancel_send_message(); -+ test_cancel_display_message(); -+ test_prpl_message_prep(); -+ test_split_message_before_sending(); -+ run_next_test(); -+} -diff --git a/chat/components/src/test/xpcshell.ini b/chat/components/src/test/xpcshell.ini ---- a/chat/components/src/test/xpcshell.ini -+++ b/chat/components/src/test/xpcshell.ini -@@ -3,9 +3,10 @@ - ; file, You can obtain one at http://mozilla.org/MPL/2.0/. - - [DEFAULT] - head = - tail = - - [test_accounts.js] - [test_commands.js] -+[test_conversations.js] - [test_logger.js]

1 0

[tor/master] Tolerate starting up with missing hidden service directory
by nickm＠torproject.org 05 Jan '15

05 Jan '15

commit 276700131a14697aa84d95a867782bbfd612277f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 5 11:39:38 2015 -0500 Tolerate starting up with missing hidden service directory Fixes bug 14106; bugfix on 0.2.6.2-alpha Found by stem tests. --- changes/bug14106 | 4 ++++ src/or/rendservice.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug14106 b/changes/bug14106 new file mode 100644 index 0000000..cf6e568 --- /dev/null +++ b/changes/bug14106 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden services): + - Successfully launch Tor with a nonexistent hidden service directory. + Our fix for bug 13942 didn't catch this case. Fixes bug 14106; + bugfix on 0.2.6.2-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index b9d9875..3b73674 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -531,7 +531,7 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { - cpd_check_t check_opts = CPD_CHECK_MODE_ONLY; + cpd_check_t check_opts = CPD_CHECK_MODE_ONLY|CPD_CHECK; if (service->dir_group_readable) { check_opts |= CPD_GROUP_READ; }

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Jan '15

05 Jan '15

commit 6fc9c692851f51103822424951b1305e978b4e49 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 5 16:45:03 2015 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index bd1ce1e..1cf4fd2 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -7,6 +7,7 @@ # cwt96 <cwt967(a)naver.com>, 2012 # Jamin <bakzaa(a)gmail.com>, 2014 # Dr.what <javrick6(a)naver.com>, 2014 +# Kevin Min <candyson1(a)naver.com>, 2015 # pCsOrI <pcsori(a)gmail.com>, 2012 # Sam Ryoo <samryoo(a)gmail.com>, 2014 # Revi_ <yena(a)revi.pe.kr>, 2014 @@ -15,8 +16,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: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-18 09:41+0000\n" -"Last-Translator: Dr.what <javrick6(a)naver.com>\n" +"PO-Revision-Date: 2015-01-05 16:41+0000\n" +"Last-Translator: Kevin Min <candyson1(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,12 +69,12 @@ msgstr "BridgeDB 에 오신 것을 환영합니다!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "지원이 되는 transport TYPEs" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "저기, %s야! " #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" @@ -136,7 +137,7 @@ msgstr "'브릿지'란?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Bridges %s는 당신이 검열을 피할수 있게 하는 Tor 릴레이입니다. " #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -158,7 +159,7 @@ msgstr "브릿지가 맛이 갔어요! 도와줘요!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "만약 당신의 Tor가 작동되지 않으면, %s로 이메일을 해야되요. " #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -172,7 +173,7 @@ msgstr "" #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "당신의 브릿지 행들은 다음과 같습니다:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -298,17 +299,17 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "%s1%s번째 단계 " #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "%s 토르 브라우저 %s 다운로드" +msgstr "%s Tor 브라우저 %s 다운로드" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "%s2%s번째 단계 " #: lib/bridgedb/templates/index.html:27 #, python-format @@ -318,7 +319,7 @@ msgstr "%s 브릿지 %s를 입수" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "%s3%s번째 단계 " #: lib/bridgedb/templates/index.html:38 #, python-format

1 0