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

[tor-browser-bundle/master] Add golang.org/x/crypto to the build process.
by gk＠torproject.org 22 Jan '15

22 Jan '15

commit e33339c763c212a09f9976d5c04f033c1ec7c18c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jan 21 19:34:00 2015 +0000 Add golang.org/x/crypto to the build process. This is required for any of: * Go >= 1.4.x (It is backwards compatible though). * obfs4proxy >= cdeda5724124ca393c87be6d01c84fe4f906d612 And replaces go.crypto (the developers moved/renamed the package). As there is no formal release process as far as I can tell for the codebase the current tip of tree commit is used for versions.alpha, and master for versions.nightly. When obfs4proxy 0.0.4 is tagged, the old go.crypto code can be removed from the build process after the new tag is added to all the versions.foo files. Fixes #14316. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 14 +++++++++++++- gitian/descriptors/mac/gitian-pluggable-transports.yml | 14 +++++++++++++- .../descriptors/windows/gitian-pluggable-transports.yml | 14 +++++++++++++- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 9 files changed, 45 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index e79e8af..d180f97 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -36,6 +36,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -242,7 +244,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 0931c59..9a86b1a 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -34,6 +34,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -270,7 +272,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 70d4b91..6e3c3a7 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -33,6 +33,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -348,7 +350,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 049824a..3311547 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -309,6 +309,7 @@ meek https://git.torproject.org/pluggable-transports/meek.git $ faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG ed25519 https://github.com/agl/ed25519.git $GOED25519_TAG siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG +goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG EOF diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4a773b8..0dba906 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -224,7 +224,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index ed54dc6..09b3172 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -190,7 +190,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 945511b..39c57ce 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -194,7 +194,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 890b6a3..a0af194 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -29,6 +29,7 @@ MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 OBFS4_TAG=obfs4proxy-0.0.3 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d200f54..cb6e53a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -33,6 +33,7 @@ MEEK_TAG=master FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=master OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7

1 0

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

22 Jan '15

commit de1eae1ea76dbcdab1ab4fd140ce7cf373939b52 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 22 03:45:22 2015 +0000 Update translations for liveusb-creator_completed --- el/el.po | 59 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/el/el.po b/el/el.po index 12b4e98..fe7dc9e 100644 --- a/el/el.po +++ b/el/el.po @@ -4,8 +4,9 @@ # # Translators: # Adrian Pappas <pappasadrian(a)gmail.com>, 2013 -# catopsi <catopsi(a)hotmail.com>, 2015 +# catopsi, 2015 # firespin <dartworldgr(a)hotmail.com>, 2014 +# LaScapigliata <ditri2000(a)hotmail.com>, 2015 # dpdt1 <dpdt1(a)espiv.net>, 2013 # anvo <fragos.george(a)hotmail.com>, 2012 # isv31 <ix4svs(a)gmail.com>, 2014 @@ -18,9 +19,9 @@ msgid "" 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: 2015-01-05 23:30+0000\n" -"Last-Translator: catopsi <catopsi(a)hotmail.com>\n" +"POT-Creation-Date: 2015-01-13 18:07+0100\n" +"PO-Revision-Date: 2015-01-22 03:30+0000\n" +"Last-Translator: LaScapigliata <ditri2000(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" @@ -33,17 +34,17 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s Εγκαταστάτης" -#: ../liveusb/gui.py:773 +#: ../liveusb/gui.py:775 #, python-format msgid "%(filename)s selected" msgstr "επιλέχθηκαν %(filename)s" -#: ../liveusb/gui.py:423 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:429 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" @@ -138,7 +139,7 @@ msgstr "Κλωνοποίηση⏎ &&⏎ Αναβάθμιση" msgid "Creating %sMB persistent overlay" msgstr "Δημιουργία %sMB μόνιμης επικάλυψης" -#: ../liveusb/gui.py:551 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Η συσκευή δεν έχει ακόμη προσαρτηθεί, οπότε δεν μπορούμε να προσδιορίσουμε την ποσότητα του ελεύθερου χώρου." @@ -148,11 +149,11 @@ msgstr "Η συσκευή δεν έχει ακόμη προσαρτηθεί, ο msgid "Download %(distribution)s" msgstr "Λυψη %(distribution)s" -#: ../liveusb/gui.py:747 +#: ../liveusb/gui.py:749 msgid "Download complete!" msgstr "Η λήψη ολοκληρώθηκε!" -#: ../liveusb/gui.py:751 +#: ../liveusb/gui.py:753 msgid "Download failed: " msgstr "Η λήψη απέτυχε:" @@ -213,7 +214,7 @@ msgstr "Αν δεν επιλεξετε ενα υπαρχον Live ISO, θα λυ msgid "Install Tails" msgstr "Εγκατάσταση του προγράμματος Tails" -#: ../liveusb/gui.py:614 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Η εγκατάσταση ολοκληρώθηκε!" @@ -222,7 +223,7 @@ msgstr "Η εγκατάσταση ολοκληρώθηκε!" msgid "Installation complete! (%s)" msgstr "Η εγκατάσταση ολοκληρώθηκε! (%s)" -#: ../liveusb/gui.py:615 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "Η εγκατάσταση έχει ολοκληρωθεί. Πιέστε το OK για να κλείσετε αυτό το πρόγραμμα." @@ -250,7 +251,7 @@ msgstr "Σιγουρευτείτε ότι το USB stick σας είναι συ msgid "Mount %s exists after unmounting" msgstr "Προσάρτιση %s παραμένει μετά την αποπροσάρτιση" -#: ../liveusb/gui.py:557 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "Δεν υπάρχει ελεύθερος χώρος στην συσκευή %(device)s" @@ -266,11 +267,11 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Δέν υπάρχει αρκετά ελεύθερος χώρος στην συσκευή \n%dMB ISO + %dMB overlay > %dMB ελεύθερος χώρος" -#: ../liveusb/gui.py:538 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Ο τύπος της κατάτμησης είναι FAT16. Ο χώρος επικάλυψης περιορίζεται στα 2G" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Ο Διαχωρισμός είναι FAT32; Περιορισμός επιφάνειας επικάλυψης σε 4G" @@ -279,7 +280,7 @@ msgstr "Ο Διαχωρισμός είναι FAT32; Περιορισμός επ msgid "Partitioning device %(device)s" msgstr "Διαχωρισμός συσκευής %(device)s" -#: ../liveusb/gui.py:605 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Μόνιμη Αποθήκευση" @@ -287,15 +288,15 @@ msgstr "Μόνιμη Αποθήκευση" msgid "Persistent Storage (0 MB)" msgstr "Μόνιμη Αποθήκευση (0 MB)" -#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 +#: ../liveusb/gui.py:669 ../liveusb/gui.py:698 msgid "Please confirm your device selection" msgstr "Παρακαλώ επιβεβαιώστε την επιλογή συσκευής" -#: ../liveusb/gui.py:451 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Ανανεωση..." -#: ../liveusb/gui.py:456 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Η ανανεωση πετυχε!" @@ -313,7 +314,7 @@ msgstr "Αφαίρεση υπάρχοντος Live Λειτουργικού" msgid "Resetting Master Boot Record of %s" msgstr "Επαναφορά Master Boot Record στο %s" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:760 msgid "Select Live ISO" msgstr "Επιλέξτε Live ISO" @@ -341,7 +342,7 @@ msgstr "Γίνεται συγχρονισμός των δεδομένων δίσ msgid "Target Device" msgstr "Στοχος" -#: ../liveusb/gui.py:761 +#: ../liveusb/gui.py:763 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -389,6 +390,10 @@ msgstr "Αυτή είναι η κονσόλα κατάστασης, όπου γ msgid "Trying to continue anyway." msgstr "Προσπάθεια να συνεχίσετε ούτως ή άλλως." +#: ../liveusb/gui.py:407 +msgid "USB drive found" +msgstr "βρέθηκε μονάδα USB" + #: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" @@ -421,7 +426,7 @@ msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Αδυναμία λήψης του Win32_LogicalDisk· η αναζήτηση του win32com δεν απέδωσε αποτελέσματα" -#: ../liveusb/gui.py:660 +#: ../liveusb/gui.py:662 msgid "Unable to mount device" msgstr "Αδυναμία φόρτωσης συσκευής" @@ -445,7 +450,7 @@ msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Αδυναμία επαναφοράς του MBR. Ίσως δεν έχετε εγκατεστημένο το πακέτο `syslinux`." -#: ../liveusb/gui.py:767 +#: ../liveusb/gui.py:769 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" @@ -537,7 +542,7 @@ msgstr "Επαληθεύεται το SHA256 άθροισμα ελέγχου τ msgid "Verifying filesystem..." msgstr "Επιβεβαίωση συστήματος αρχείων..." -#: ../liveusb/gui.py:694 +#: ../liveusb/gui.py:696 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Προσοχή: Η δημιουργία μόνιμου χώρου θα διαγράψει τον ήδη υπάρχοντα." @@ -554,14 +559,14 @@ msgstr "Προειδοποίηση: Αυτό το εργαλείο πρέπει msgid "Wrote to device at %(speed)d MB/sec" msgstr "Έγινε εγγραφή στην συσκευή με ταχύτητα %(speed)d MB/sec" -#: ../liveusb/gui.py:668 +#: ../liveusb/gui.py:670 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Πρόκειται να εγκαταστήσετε το Tails στο %(size)s %(vendor)s %(model)s δίσκο (%(device)s). Όλα τα υπάρχοντα δεδομένα θα χαθούν. Συνέχεια;" -#: ../liveusb/gui.py:684 +#: ../liveusb/gui.py:686 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -575,7 +580,7 @@ msgid "" "ext4 filesystem" msgstr "Χρησιμοποιείτε μια παλιά έκδοση του syslinux-extlinux που δεν υποστηρίζει το σύστημα αρχείων ext4. " -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:754 msgid "You can try again to resume your download" msgstr "Μπορείτε να δοκιμάσετε να συνεχίσετε την λήψη σας"

1 0

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

22 Jan '15

commit b60574f37fec919be2948c81f0a85a512339ad22 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 22 03:45:17 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 abe44d5..fe7dc9e 100644 --- a/el/el.po +++ b/el/el.po @@ -6,6 +6,7 @@ # Adrian Pappas <pappasadrian(a)gmail.com>, 2013 # catopsi, 2015 # firespin <dartworldgr(a)hotmail.com>, 2014 +# LaScapigliata <ditri2000(a)hotmail.com>, 2015 # dpdt1 <dpdt1(a)espiv.net>, 2013 # anvo <fragos.george(a)hotmail.com>, 2012 # isv31 <ix4svs(a)gmail.com>, 2014 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-14 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-22 03:30+0000\n" +"Last-Translator: LaScapigliata <ditri2000(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" @@ -391,7 +392,7 @@ msgstr "Προσπάθεια να συνεχίσετε ούτως ή άλλως. #: ../liveusb/gui.py:407 msgid "USB drive found" -msgstr "" +msgstr "βρέθηκε μονάδα USB" #: ../liveusb/creator.py:954 #, python-format

1 0

[webwml/master] link to the windows exe new locations
by arma＠torproject.org 22 Jan '15

22 Jan '15

commit 5fd270f94a8a7ae991a950856a2b718803e7b9ff Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jan 21 20:32:18 2015 -0500 link to the windows exe new locations it is still unresolved how to automatically update the tor version here when it changes inside the tor browser though. --- include/versions.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 6dcedb6..1184539 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -64,8 +64,8 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-tor-<version-win32-stable>.zip</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-win32-tor-<version-win32-alpha>.zip</define-tag> <define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>

1 0

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

21 Jan '15

commit 3c85672831f9c184287d5b1b7d78cfc4e4baefae Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 21 23:45:22 2015 +0000 Update translations for liveusb-creator_completed --- tr/tr.po | 57 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index f5bbc3e..8e3af21 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -4,6 +4,7 @@ # # Translators: # Ayca Omrak <aycaom(a)hotmail.com>, 2013 +# banu arı <banu-ari(a)hotmail.com>, 2015 # Emir Sarı <bitigchi(a)openmailbox.org>, 2014 # Güven ALBAYRAK <guvenalbayrak52(a)gmail.com>, 2014 # mrtmsy <mertamasya(a)gmail.com>, 2014 @@ -14,9 +15,9 @@ msgid "" 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 13:13+0000\n" -"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" +"POT-Creation-Date: 2015-01-13 18:07+0100\n" +"PO-Revision-Date: 2015-01-21 23:31+0000\n" +"Last-Translator: banu arı <banu-ari(a)hotmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,17 +30,17 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s Yükleyici" -#: ../liveusb/gui.py:773 +#: ../liveusb/gui.py:775 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s seçildi" -#: ../liveusb/gui.py:423 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:429 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" @@ -134,7 +135,7 @@ msgstr "Çoğalt\nve\nYükselt" msgid "Creating %sMB persistent overlay" msgstr "%sMB kalıcı kaplaması oluşturuluyor" -#: ../liveusb/gui.py:551 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Cihaz henüz takılı değil, bu yüzden boş alan hesaplanması şu an mümkün değil." @@ -144,11 +145,11 @@ msgstr "Cihaz henüz takılı değil, bu yüzden boş alan hesaplanması şu an msgid "Download %(distribution)s" msgstr "%(distribution)s İndir" -#: ../liveusb/gui.py:747 +#: ../liveusb/gui.py:749 msgid "Download complete!" msgstr "İndirme tamamlandı!s" -#: ../liveusb/gui.py:751 +#: ../liveusb/gui.py:753 msgid "Download failed: " msgstr "İndirme başarısız:" @@ -209,7 +210,7 @@ msgstr "Eğer mevcut bir Çalışır ISO seçmezseniz, seçili olan sürüm indi msgid "Install Tails" msgstr "Tails'i Yükle" -#: ../liveusb/gui.py:614 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Kurulum tamamlandı!" @@ -218,7 +219,7 @@ msgstr "Kurulum tamamlandı!" msgid "Installation complete! (%s)" msgstr "Kurulum tamamlandı! (%s)" -#: ../liveusb/gui.py:615 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "Kutulum tamamlandı. Lütfen programı kapatmak için TAMAM butonuna basın." @@ -246,7 +247,7 @@ msgstr "USB belleğinizin takılı ve FAT dosya sistemi ile biçimlendirildiğin msgid "Mount %s exists after unmounting" msgstr "%s bağlantısı ayırma işleminden sonra mevcut" -#: ../liveusb/gui.py:557 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "%(device)s cihazında boş alan yok" @@ -262,11 +263,11 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Aygıtta yeterli boş alan yok.\n%dMB ISO + %dMB kaplama > %dMB boş alan" -#: ../liveusb/gui.py:538 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partisyon FAT16 biçiminde; Kaplama boyutu 2G ile sınırlandırılıyor" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Disk bölümü FAT32 biçiminde; Kaplama boyutu 4G'a sınırlanıyor" @@ -275,7 +276,7 @@ msgstr "Disk bölümü FAT32 biçiminde; Kaplama boyutu 4G'a sınırlanıyor" msgid "Partitioning device %(device)s" msgstr "%(device)s cihazı bölümlendiriliyor " -#: ../liveusb/gui.py:605 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Kalıcı Depo" @@ -283,15 +284,15 @@ msgstr "Kalıcı Depo" msgid "Persistent Storage (0 MB)" msgstr "Kalıcı Depo (0 MB)" -#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 +#: ../liveusb/gui.py:669 ../liveusb/gui.py:698 msgid "Please confirm your device selection" msgstr "Lütfen cihaz seçiminizi onaylayın." -#: ../liveusb/gui.py:451 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Sürümler yenileniyor..." -#: ../liveusb/gui.py:456 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Sürümler güncelleştirildi!" @@ -309,7 +310,7 @@ msgstr "Mevcut Çalışan İS kaldırılıyor" msgid "Resetting Master Boot Record of %s" msgstr "%s'in Ana Önyükleme Kaydı Sıfırlanıyor" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:760 msgid "Select Live ISO" msgstr "Live ISO seçin" @@ -337,7 +338,7 @@ msgstr "Diskteki veriler eşitleniyor..." msgid "Target Device" msgstr "Hedef Aygıt" -#: ../liveusb/gui.py:761 +#: ../liveusb/gui.py:763 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -385,6 +386,10 @@ msgstr "Bu, tüm iletilerin yazılacağı durum konsoludur." msgid "Trying to continue anyway." msgstr "Yine de devam edilmeye çalışılıyor" +#: ../liveusb/gui.py:407 +msgid "USB drive found" +msgstr "USB sürücüsü aktif" + #: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" @@ -417,7 +422,7 @@ msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Win32_LogicalDisk alınamadı; win32com sorgusu hiçbir sonuç döndürmedi" -#: ../liveusb/gui.py:660 +#: ../liveusb/gui.py:662 msgid "Unable to mount device" msgstr "Aygıt bağlanamıyor" @@ -441,7 +446,7 @@ msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "MBR sıfırlanamadı. Bilgisayarınızda 'syslinux' paketi yüklenmemiş olabilir." -#: ../liveusb/gui.py:767 +#: ../liveusb/gui.py:769 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" @@ -533,7 +538,7 @@ msgstr "ÇalışırCD imajının SHA256 doğrulaması yapılıyor..." msgid "Verifying filesystem..." msgstr "Dosya sistemi onaylanıyor..." -#: ../liveusb/gui.py:694 +#: ../liveusb/gui.py:696 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Uyarı: Yeni bir kalıcı kaplama yaratmak mevcut olanın silinmesine neden olacaktır. " @@ -550,14 +555,14 @@ msgstr "Uyarı: Bu aracı Yönetici olarak çalıştırmak zorundasınız. Bunu msgid "Wrote to device at %(speed)d MB/sec" msgstr "Cihaza %(speed)d MB/saniye hızında yazıldı" -#: ../liveusb/gui.py:668 +#: ../liveusb/gui.py:670 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Tails'i yükseltmek için gidilen %(size)s %(vendor)s %(model)s cihaz (%(device)s). Seçilen cihazın üzerindeki tüm veriler kaybolur. Devam etmek istiyor musun?" -#: ../liveusb/gui.py:684 +#: ../liveusb/gui.py:686 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -571,7 +576,7 @@ msgid "" "ext4 filesystem" msgstr "syslinux-extlinux'un ext4 dosya sistemini desteklemeyen eski bir sürümünü kullanıyorsunuz" -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:754 msgid "You can try again to resume your download" msgstr "İndirmeyi sürdürmeyi yeniden deneyebilirsiniz"

1 0

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

21 Jan '15

commit 54bb73f9fd23f5d6b77e0087d90c6501473d19d1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 21 23:45:17 2015 +0000 Update translations for liveusb-creator --- tr/tr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index c1d6a08..8e3af21 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -4,6 +4,7 @@ # # Translators: # Ayca Omrak <aycaom(a)hotmail.com>, 2013 +# banu arı <banu-ari(a)hotmail.com>, 2015 # Emir Sarı <bitigchi(a)openmailbox.org>, 2014 # Güven ALBAYRAK <guvenalbayrak52(a)gmail.com>, 2014 # mrtmsy <mertamasya(a)gmail.com>, 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-14 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-21 23:31+0000\n" +"Last-Translator: banu arı <banu-ari(a)hotmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -387,7 +388,7 @@ msgstr "Yine de devam edilmeye çalışılıyor" #: ../liveusb/gui.py:407 msgid "USB drive found" -msgstr "" +msgstr "USB sürücüsü aktif" #: ../liveusb/creator.py:954 #, python-format

1 0

[torsocks/master] Allow TCP Fast Open clients go through tor
by dgoulet＠torproject.org 21 Jan '15

21 Jan '15

commit bd6ae94ff0d1a1a1064e6cfd40320182e8ff5ccc Author: Tim RÃŒhsen <tim.ruehsen(a)gmx.de> Date: Wed Jan 14 14:48:37 2015 +0100 Allow TCP Fast Open clients go through tor This patch prevents TFO clients to silently leak when torified. TFO uses sendto() instead of connect()/send(). Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/Makefile.am | 2 +- src/lib/sendto.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/torsocks.h | 19 +++++++++++- 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index d64b3f6..6e137f3 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -9,6 +9,6 @@ lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ connect.c gethostbyname.c getaddrinfo.c close.c \ getpeername.c socket.c syscall.c socketpair.c recv.c \ - exit.c accept.c listen.c fclose.c + exit.c accept.c listen.c fclose.c sendto.c libtorsocks_la_LIBADD = $(top_builddir)/src/common/libcommon.la diff --git a/src/lib/sendto.c b/src/lib/sendto.c new file mode 100644 index 0000000..3362026 --- /dev/null +++ b/src/lib/sendto.c @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2015 - Tim Rühsen <tim.ruehsen(a)gmx.de> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <assert.h> + +#include <common/log.h> +#include <common/utils.h> + +#include "torsocks.h" + +/* + * Using TCP Fast Open (TFO) uses sendto() instead of connect() with 'flags' + * set to MSG_FASTOPEN. Without this code, using TFO simply bypasses Tor + * without letting the user know. + * + * This solution simply ignores TFO and falls back to connect(). At the time + * the tor server supports TFO, socks5.c (client code) could implement it in + * send_data() and connect_socks5(). + */ + +/* sendto(2) + * args: int sockfd, const void *buf, size_t len, int flags, + * const struct sockaddr *dest_addr, socklen_t addrlen + */ +TSOCKS_LIBC_DECL(sendto, LIBC_SENDTO_RET_TYPE, LIBC_SENDTO_SIG) + +/* + * Torsocks call for sendto(2). + */ +LIBC_SENDTO_RET_TYPE tsocks_sendto(LIBC_SENDTO_SIG) +{ +#ifdef MSG_FASTOPEN + int ret; + + if ((flags & MSG_FASTOPEN) == 0) { + /* No TFO, fallback to libc sendto() */ + goto libc_sendto; + } + + DBG("[sendto] TCP fast open catched on fd %d", sockfd); + + ret = connect(sockfd, dest_addr, addrlen); + if (ret == 0) { + /* Connection established, send payload */ + ret = send(sockfd, buf, len, flags & ~MSG_FASTOPEN); + } + + return ret; + +libc_sendto: +#endif /* MSG_FASTOPEN */ + + return tsocks_libc_sendto(LIBC_SENDTO_ARGS); +} + +/* + * Libc hijacked symbol sendto(2). + */ +LIBC_SENDTO_DECL +{ + if (!tsocks_libc_sendto) { + tsocks_libc_sendto = tsocks_find_libc_symbol( + LIBC_SENDTO_NAME_STR, TSOCKS_SYM_EXIT_NOT_FOUND); + } + + return tsocks_sendto(LIBC_SENDTO_ARGS); +} diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 6ded557..3b9cda2 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> + * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> * 2013 - David Goulet <dgoulet(a)ev0ke.net> * @@ -170,6 +170,7 @@ struct hostent **result, int *h_errnop int sockfd, struct sockaddr *addr, socklen_t *addrlen #define LIBC_GETPEERNAME_ARGS sockfd, addr, addrlen +/* recvmsg(2) */ #define LIBC_RECVMSG_NAME recvmsg #define LIBC_RECVMSG_NAME_STR XSTR(LIBC_RECVMSG_NAME) #define LIBC_RECVMSG_RET_TYPE ssize_t @@ -178,6 +179,16 @@ struct hostent **result, int *h_errnop #define LIBC_RECVMSG_ARGS \ sockfd, msg, flags +/* sendto(2) */ +#define LIBC_SENDTO_NAME sendto +#define LIBC_SENDTO_NAME_STR XSTR(LIBC_SENDTO_NAME) +#define LIBC_SENDTO_RET_TYPE ssize_t +#define LIBC_SENDTO_SIG \ + int sockfd, const void *buf, size_t len, int flags,\ + const struct sockaddr *dest_addr, socklen_t addrlen +#define LIBC_SENDTO_ARGS \ + sockfd, buf, len, flags, dest_addr, addrlen + /* accept(2) */ #define LIBC_ACCEPT_NAME accept #define LIBC_ACCEPT_NAME_STR XSTR(LIBC_ACCEPT_NAME) @@ -277,6 +288,12 @@ TSOCKS_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) #define LIBC_RECVMSG_DECL \ LIBC_RECVMSG_RET_TYPE LIBC_RECVMSG_NAME(LIBC_RECVMSG_SIG) +/* sendto(2) */ +extern TSOCKS_LIBC_DECL(sendto, LIBC_SENDTO_RET_TYPE, LIBC_SENDTO_SIG) +TSOCKS_DECL(sendto, LIBC_SENDTO_RET_TYPE, LIBC_SENDTO_SIG) +#define LIBC_SENDTO_DECL \ + LIBC_SENDTO_RET_TYPE LIBC_SENDTO_NAME(LIBC_SENDTO_SIG) + /* socket(2) */ extern TSOCKS_LIBC_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) TSOCKS_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG)

1 0

[tor/master] use the correct free fn. spotted by dgoulet
by nickm＠torproject.org 21 Jan '15

21 Jan '15

commit 38b3f9a619a7e34cb0fe778235afb91953c84fe7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 21 14:54:38 2015 -0500 use the correct free fn. spotted by dgoulet --- src/common/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/workqueue.c b/src/common/workqueue.c index 77a4fbc..5da29d5 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -148,7 +148,7 @@ workqueue_entry_cancel(workqueue_entry_t *ent) tor_mutex_release(&ent->on_pool->lock); if (cancelled) { - tor_free(ent); + workqueue_entry_free(ent); } return result; }

1 0

[tor/master] Merge branch 'better_workqueue_v3_squashed'
by nickm＠torproject.org 21 Jan '15

21 Jan '15

1 0

[tor/master] Fix: remove whitespace and update a comment in cpuworker.c
by nickm＠torproject.org 21 Jan '15

21 Jan '15

commit 84f5cb749d614deeb66f9032c54cd9885e300493 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Jan 21 14:29:03 2015 -0500 Fix: remove whitespace and update a comment in cpuworker.c Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/cpuworker.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 3f129de..39d2079 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -171,9 +171,8 @@ update_state_threadfn(void *state_, void *work_) return WQ_RPL_REPLY; } -/** Called when the onion key has changed and we need to spawn new - * cpuworkers. Close all currently idle cpuworkers, and mark the last - * rotation time as now. +/** Called when the onion key has changed so update all CPU worker(s) with + * new function pointers with which a new state will be generated. */ void cpuworkers_rotate_keyinfo(void) @@ -336,7 +335,7 @@ cpuworker_onion_handshake_replyfn(void *work_) "Unpacking cpuworker reply %p, circ=%p, success=%d", job, circ, rpl.success); - if (circ->base_.magic == DEAD_CIRCUIT_MAGIC) { + if (circ->base_.magic == DEAD_CIRCUIT_MAGIC) { /* The circuit was supposed to get freed while the reply was * pending. Instead, it got left for us to free so that we wouldn't freak * out when the job->circ field wound up pointing to nothing. */

1 0