November 2014 - tor-commits - lists.torproject.org

[tor/master] Throw identify-node-by-nickname down the memory hole
by nickm＠torproject.org 06 Nov '14

06 Nov '14

commit 68af1e7e9be8bef82b4574ac0934310af71a764b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 6 11:10:58 2014 -0500 Throw identify-node-by-nickname down the memory hole Authorities are no longer voting on Named, so specifying nodes by nickname isn't a clever thing to do. (Not that it ever was!) So remove the documentation that suggests that you should do it. Additionally, add proper cross-references to our __node__ lists, and explain about the optional $ before identity digests. Also, the oxford comma: endorsed by Steven Pinker, my spouse, and my 11th grade English teacher. Closes 13381. --- changes/doc13381 | 5 +++++ doc/tor.1.txt | 40 ++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/changes/doc13381 b/changes/doc13381 new file mode 100644 index 0000000..acc4bb8 --- /dev/null +++ b/changes/doc13381 @@ -0,0 +1,5 @@ + o Documentation: + - Stop suggesting that users specify nodes by nickname: it isn't a + good idea. Also, properly cross-reference how to specify nodes + in all parts of the manual for options that take a list of + nodes. Closes ticket 13381. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 84070da..1c3be8c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -711,10 +711,11 @@ The following options are useful only for clients (that is, if unless ORPort, ExtORPort, or DirPort are configured.) (Default: 0) [[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, country codes and address - patterns of nodes to avoid when building a circuit. + A list of identity fingerprints, country codes, and address + patterns of nodes to avoid when building a circuit. Country codes must + be wrapped in braces; fingerprints may be preceded by a dollar sign. (Example: - ExcludeNodes SlowServer, ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + ExcludeNodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + By default, this option is treated as a preference that Tor is allowed to override in order to keep working. @@ -734,11 +735,13 @@ The following options are useful only for clients (that is, if [[ExcludeExitNodes]] **ExcludeExitNodes** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, country codes and address + A list of identity fingerprints, country codes, and address patterns of nodes to never use when picking an exit node---that is, a node that delivers traffic for you outside the Tor network. Note that any node listed in ExcludeNodes is automatically considered to be part of this - list too. See also the caveats on the "ExitNodes" option below. + list too. See + the **ExcludeNodes** option for more information on how to specify + nodes. See also the caveats on the "ExitNodes" option below. [[GeoIPExcludeUnknown]] **GeoIPExcludeUnknown** **0**|**1**|**auto**:: If this option is set to 'auto', then whenever any country code is set in @@ -749,9 +752,10 @@ The following options are useful only for clients (that is, if configured or can't be found. (Default: auto) [[ExitNodes]] **ExitNodes** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, country codes and address + A list of identity fingerprints, country codes, and address patterns of nodes to use as exit node---that is, a - node that delivers traffic for you outside the Tor network. + + node that delivers traffic for you outside the Tor network. See + the **ExcludeNodes** option for more information on how to specify nodes. + + Note that if you list too few nodes here, or if you exclude too many exit nodes with ExcludeExitNodes, you can degrade functionality. For example, @@ -772,7 +776,7 @@ The following options are useful only for clients (that is, if this option. [[EntryNodes]] **EntryNodes** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, and country codes of nodes + A list of identity fingerprints and country codes of nodes to use for the first hop in your normal circuits. Normal circuits include all circuits except for direct connections to directory servers. The Bridge @@ -780,7 +784,8 @@ The following options are useful only for clients (that is, if UseBridges is 1, the Bridges are used as your entry nodes. + + The ExcludeNodes option overrides this option: any node listed in both - EntryNodes and ExcludeNodes is treated as excluded. + EntryNodes and ExcludeNodes is treated as excluded. See + the **ExcludeNodes** option for more information on how to specify nodes. [[StrictNodes]] **StrictNodes** **0**|**1**:: If StrictNodes is set to 1, Tor will treat the ExcludeNodes option as a @@ -929,12 +934,14 @@ The following options are useful only for clients (that is, if but it has not yet been completely constructed. (Default: 32) [[NodeFamily]] **NodeFamily** __node__,__node__,__...__:: - The Tor servers, defined by their identity fingerprints or nicknames, + The Tor servers, defined by their identity fingerprints, constitute a "family" of similar or co-administered servers, so never use any two of them in the same circuit. Defining a NodeFamily is only needed when a server doesn't list the family itself (with MyFamily). This option - can be used multiple times. In addition to nodes, you can also list - IP address and ranges and country codes in {curly braces}. + can be used multiple times; each instance defines a separate family. In + addition to nodes, you can also list IP address and ranges and country + codes in {curly braces}. See the **ExcludeNodes** option for more + information on how to specify nodes. [[EnforceDistinctSubnets]] **EnforceDistinctSubnets** **0**|**1**:: If 1, Tor will not put two servers whose IP addresses are "too close" on @@ -1538,7 +1545,7 @@ is non-zero): [[MyFamily]] **MyFamily** __node__,__node__,__...__:: Declare that this Tor server is controlled or administered by a group or organization identical or similar to that of the other servers, defined by - their identity fingerprints or nicknames. When two servers both declare + their identity fingerprints. When two servers both declare that they are in the same \'family', Tor clients will not use them in the same circuit. (Each server only needs to list the other servers in its family; it doesn't need to list itself, but it won't hurt.) Do not list @@ -2204,16 +2211,17 @@ The following options are used for running a testing Tor network. Changing this requires that **TestingTorNetwork** is set. (Default: 8) [[TestingDirAuthVoteExit]] **TestingDirAuthVoteExit** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, country codes and + A list of identity fingerprints, country codes, and address patterns of nodes to vote Exit for regardless of their uptime, bandwidth, or exit policy. See the **ExcludeNodes** option for more information on how to specify nodes. + In order for this option to have any effect, **TestingTorNetwork** - has to be set. + has to be set. See the **ExcludeNodes** option for more + information on how to specify nodes. [[TestingDirAuthVoteGuard]] **TestingDirAuthVoteGuard** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, country codes and + A list of identity fingerprints and country codes and address patterns of nodes to vote Guard for regardless of their uptime and bandwidth. See the **ExcludeNodes** option for more information on how to specify nodes.

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Nov '14

06 Nov '14

commit 6e68ad6eb0d0bc58e2b14a8f7bb7f6bca6896545 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 6 15:45:08 2014 +0000 Update translations for torcheck --- sl_SI/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl_SI/torcheck.po b/sl_SI/torcheck.po index 724e67c..ae044d0 100644 --- a/sl_SI/torcheck.po +++ b/sl_SI/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-11-06 15:11+0000\n" +"PO-Revision-Date: 2014-11-06 15:16+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Nov '14

06 Nov '14

commit 743078ef203a08cbf27c05f0a4da1c397452c63c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 6 15:15:08 2014 +0000 Update translations for torcheck --- sl_SI/torcheck.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sl_SI/torcheck.po b/sl_SI/torcheck.po index 977413e..724e67c 100644 --- a/sl_SI/torcheck.po +++ b/sl_SI/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-11-06 14:43+0000\n" +"PO-Revision-Date: 2014-11-06 15:11+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n" @@ -74,22 +74,22 @@ msgid "Learn More »" msgstr "Več o tem »" msgid "Go" -msgstr "" +msgstr "Pojdite" msgid "Short User Manual" -msgstr "" +msgstr "Katka navodila uporabniku" msgid "Donate to Support Tor" -msgstr "" +msgstr "Darujte za podporo Tor" msgid "Tor Q&A Site" -msgstr "" +msgstr "Tor Q&A Site" msgid "Volunteer" -msgstr "" +msgstr "Prostovoljec" msgid "JavaScript is enabled." -msgstr "" +msgstr "JavaScript je omogočen." msgid "JavaScript is disabled." msgstr ""

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Nov '14

06 Nov '14

commit f44df79388de5355569762ae4946932e4cb21598 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 6 14:45:08 2014 +0000 Update translations for torcheck --- sl_SI/torcheck.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sl_SI/torcheck.po b/sl_SI/torcheck.po index af24c14..977413e 100644 --- a/sl_SI/torcheck.po +++ b/sl_SI/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-11-05 08:32+0000\n" +"PO-Revision-Date: 2014-11-06 14:43+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Prosimo oglejte si <a href=\"https://www.torproject.org/\">Tor website</a> za nadaljne informacije o varni uporabi Tor. Sedaj lahko anonimno brskate po spletu." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Varnostna nadgradnja za zavitek Tor brskalnik je narazpolago." @@ -43,7 +43,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Če poskušate uporabiti Tor klienta, si oglejte <a href=\"https://www.torproject.org/\">Tor website</a> in natančnejša <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">navodila za nastavitev vašega Tor klienta</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Žal je prišlo do nepričakovane napaka. Vaša poizvedba ni uspela ali pa je bil prejet nepričakovan odziv." @@ -51,7 +51,7 @@ msgstr "Žal je prišlo do nepričakovane napaka. Vaša poizvedba ni uspela ali msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "Začasen izpad storitev nam preprečuje ugotavljanje ali je vaš izvorni IP naslov v <a href=\"https://www.torproject.org/\">Tor</a> vozlišču." msgid "Your IP address appears to be: " msgstr "Izgleda, da je Vaš IP naslov:" @@ -63,7 +63,7 @@ msgid "This page is also available in the following languages:" msgstr "Ta stran je tudi razpoložljiva v sledečih jezikih:" msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "Za več informacij o tem izstopnem releju, glejte:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " @@ -71,7 +71,7 @@ msgid "" msgstr "Tor Project je ne profitnen, predan raziskavam, razvoju in izobraževnju o anonimnosti in zasebnosti." msgid "Learn More »" -msgstr "" +msgstr "Več o tem »" msgid "Go" msgstr ""

1 0

[tor-messenger-build/master] Fix a typo in startup script
by sukhbir＠torproject.org 06 Nov '14

06 Nov '14

commit c1c34b1bf42ffa22457da6ffe1444c4f3965e166 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Nov 6 19:06:38 2014 +0530 Fix a typo in startup script --- projects/tor-messenger/start-tor-messenger | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger index 02f56b4..406fb48 100755 --- a/projects/tor-messenger/start-tor-messenger +++ b/projects/tor-messenger/start-tor-messenger @@ -181,7 +181,7 @@ if [ -L "$myname" ]; then myname="`readlink -f "$myname" 2>/dev/null`" if [ "$?" -ne 0 ]; then # Ugh. - complain "start-tor-browser cannot be run using a symlink on this operating system." + complain "start-tor-messenger cannot be run using a symlink on this operating system." fi fi fi

1 0

[tor-messenger-build/master] Add a start-tor-messenger script
by boklm＠torproject.org 06 Nov '14

06 Nov '14

commit 53c51c13e6f5280a238a7f3fd0bc6c0efbc6752d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 6 14:07:27 2014 +0100 Add a start-tor-messenger script A script based on start-tor-browser, to set LD_LIBRARY_PATH before starting instantbird. --- projects/tor-messenger/build | 2 + projects/tor-messenger/config | 1 + projects/tor-messenger/start-tor-messenger | 309 ++++++++++++++++++++++++++++ 3 files changed, 312 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 664924e..6e01dcf 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -2,6 +2,8 @@ set -e tar xf [% c('input_files_by_name/instantbird') %] tar xf [% c('input_files_by_name/gcc') %] +chmod 755 start-tor-messenger +mv start-tor-messenger instantbird/ mkdir -p instantbird/lib cp -L gcc/lib64/libstdc++.so.6 instantbird/lib/ cd instantbird/extensions diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 59da0eb..050b4aa 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -15,3 +15,4 @@ input_files: pkg_type: build - project: gcc name: gcc + - filename: start-tor-messenger diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger new file mode 100755 index 0000000..02f56b4 --- /dev/null +++ b/projects/tor-messenger/start-tor-messenger @@ -0,0 +1,309 @@ +#!/bin/bash +# +# Based on the start-tor-browser script +# +# GNU/Linux does not really require something like RelativeLink.c +# However, we do want to have the same look and feel with similar features. +# +# To run in debug mode simply pass --debug +# +# Copyright 2014 The Tor Project. See LICENSE for licensing information. + +complain_dialog_title="Tor Messenger" + +# First, make sure DISPLAY is set. If it isn't, we're hosed; scream +# at stderr and die. +if [ "x$DISPLAY" = "x" ]; then + echo "$complain_dialog_title must be run within the X Window System." >&2 + echo "Exiting." >&2 + exit 1 +fi + +# Do not (try to) connect to the session manager +unset SESSION_MANAGER + +# Determine whether we are running in a terminal. If we are, we +# should send our error messages to stderr... +ARE_WE_RUNNING_IN_A_TERMINAL=0 +if [ -t 1 -o -t 2 ]; then + ARE_WE_RUNNING_IN_A_TERMINAL=1 +fi + +# ...unless we're running in the same terminal as startx or xinit. In +# that case, the user is probably running us from a GUI file manager +# in an X session started by typing startx at the console. +# +# Hopefully, the local ps command supports BSD-style options. (The ps +# commands usually used on Linux and FreeBSD do; do any other OSes +# support running Linux binaries?) +ps T 2>/dev/null |grep startx 2>/dev/null |grep -v grep 2>&1 >/dev/null +not_running_in_same_terminal_as_startx="$?" +ps T 2>/dev/null |grep xinit 2>/dev/null |grep -v grep 2>&1 >/dev/null +not_running_in_same_terminal_as_xinit="$?" + +# not_running_in_same_terminal_as_foo has the value 1 if we are *not* +# running in the same terminal as foo. +if [ "$not_running_in_same_terminal_as_startx" -eq 0 -o \ + "$not_running_in_same_terminal_as_xinit" -eq 0 ]; then + ARE_WE_RUNNING_IN_A_TERMINAL=0 +fi + +# Complain about an error, by any means necessary. +# Usage: complain message +# message must not begin with a dash. +complain () { + # Trim leading newlines, to avoid breaking formatting in some dialogs. + complain_message="`echo "$1" | sed '/./,$!d'`" + + # If we're being run in a terminal, complain there. + if [ "$ARE_WE_RUNNING_IN_A_TERMINAL" -ne 0 ]; then + echo "$complain_message" >&2 + return + fi + + # Otherwise, we're being run by a GUI program of some sort; + # try to pop up a message in the GUI in the nicest way + # possible. + # + # In mksh, non-existent commands return 127; I'll assume all + # other shells set the same exit code if they can't run a + # command. (xmessage returns 1 if the user clicks the WM + # close button, so we do need to look at the exact exit code, + # not just assume the command failed to display a message if + # it returns non-zero.) + + # First, try zenity. + zenity --error \ + --title="$complain_dialog_title" \ + --text="$complain_message" + if [ "$?" -ne 127 ]; then + return + fi + + # Try kdialog. + kdialog --title "$complain_dialog_title" \ + --error "$complain_message" + if [ "$?" -ne 127 ]; then + return + fi + + # Try xmessage. + xmessage -title "$complain_dialog_title" \ + -center \ + -buttons OK \ + -default OK \ + -xrm '*message.scrollVertical: Never' \ + "$complain_message" + if [ "$?" -ne 127 ]; then + return + fi + + # Try gxmessage. This one isn't installed by default on + # Debian with the default GNOME installation, so it seems to + # be the least likely program to have available, but it might + # be used by one of the 'lightweight' Gtk-based desktop + # environments. + gxmessage -title "$complain_dialog_title" \ + -center \ + -buttons GTK_STOCK_OK \ + -default OK \ + "$complain_message" + if [ "$?" -ne 127 ]; then + return + fi +} + +if [ "`id -u`" -eq 0 ]; then + complain "The Tor Messenger should not be run as root. Exiting." + exit 1 +fi + +debug=0 +usage_message="usage: $0 [--debug]" +# !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below +if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then + debug=1 + shift # pop the debug argument + printf "\nDebug enabled.\n\n" +elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then + echo "$usage_message" + exit 0 +fi + +# If the user hasn't requested 'debug mode', close whichever of stdout +# and stderr are not ttys, to keep Firefox and the stuff loaded by/for +# it (including the system's shared-library loader) from printing +# messages to $HOME/.xsession-errors . (Users wouldn't have seen +# messages there anyway.) +# +# If the user has requested 'debug mode', don't muck with the FDs. +if [ "$debug" -ne 1 ]; then + if [ '!' -t 1 ]; then + # stdout is not a tty + exec >/dev/null + fi + if [ '!' -t 2 ]; then + # stderr is not a tty + exec 2>/dev/null + fi +fi + +# If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority +# before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely +# on applications using this default value. +if [ -z "$XAUTHORITY" ]; then + XAUTHORITY=~/.Xauthority + export XAUTHORITY +fi + +# If this script is being run through a symlink, we need to know where +# in the filesystem the script itself is, not where the symlink is. +myname="$0" +if [ -L "$myname" ]; then + # XXX readlink is not POSIX, but is present in GNU coreutils + # and on FreeBSD. Unfortunately, the -f option (which follows + # a whole chain of symlinks until it reaches a non-symlink + # path name) is a GNUism, so we have to have a fallback for + # FreeBSD. Fortunately, FreeBSD has realpath instead; + # unfortunately, that's also non-POSIX and is not present in + # GNU coreutils. + # + # If this launcher were a C program, we could just use the + # realpath function, which *is* POSIX. Too bad POSIX didn't + # make that function accessible to shell scripts. + + # If realpath is available, use it; it Does The Right Thing. + possibly_my_real_name="`realpath "$myname" 2>/dev/null`" + if [ "$?" -eq 0 ]; then + myname="$possibly_my_real_name" + else + # realpath is not available; hopefully readlink -f works. + myname="`readlink -f "$myname" 2>/dev/null`" + if [ "$?" -ne 0 ]; then + # Ugh. + complain "start-tor-browser cannot be run using a symlink on this operating system." + fi + fi +fi + +# Try to be agnostic to where we're being started from, chdir to where +# the script is. +mydir="`dirname "$myname"`" +test -d "$mydir" && cd "$mydir" + +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + +# If ${PWD} results in a zero length HOME, we can try something else... +if [ ! "${PWD}" ]; then + # "hacking around some braindamage" + HOME="`pwd`" + export HOME + surveysays="This system has a messed up shell.\n" +else + HOME="${PWD}" + export HOME +fi + +SYSARCHITECTURE=$(getconf LONG_BIT) +TORARCHITECTURE=$(expr "$(file instantbird)" : '.*ELF $[[:digit:]]*$') + +if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then + complain "Wrong architecture? 32-bit vs. 64-bit." + exit 1 +fi + +LD_LIBRARY_PATH="${HOME}/lib/:${HOME}/extensions/tor-launcher@torproject.org/TorBrowser/Tor:${HOME}/extensions/ctypes-otr@tormessenger/chrome/content" +export LD_LIBRARY_PATH + +function setControlPortPasswd() { + local ctrlPasswd=$1 + + if test -z "$ctrlPasswd" -o "$ctrlPasswd" = $'\"secret\"' ; then + unset TOR_CONTROL_PASSWD + return + fi + + if test "${ctrlPasswd:0:1}" = $'\"'; then # First 2 chars were '" + printf "Using system Tor process.\n" + export TOR_CONTROL_PASSWD + else + complain "There seems to have been a quoting problem with your \ +TOR_CONTROL_PASSWD environment variable." + cat <<EOF + +The Tor ControlPort password should be given inside double quotes, inside single +quotes, i.e. if the ControlPort password is “secret” (without curly quotes) then +we must start this script after setting the environment variable exactly like +this: + + \$ TOR_CONTROL_PASSWD='"secret"' $myname + +EOF + fi +} + +# Using a system-installed Tor process with Tor Messenger: +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# The Tor ControlPort password should be given inside double quotes, inside +# single quotes, i.e. if the ControlPort password is “secret” (without +# curly quotes) then we must set the environment variable *exactly* like +# this: +# +# TOR_CONTROL_PASSWD='"secret"' +# +# Yes, the variable MUST be double-quoted, then single-quoted, exactly as +# shown. This is used by TorButtom to authenticate to Tor's ControlPort, and +# is necessary for using TBB with a with a system-installed Tor. +# +# Additionally, if using a system-installed Tor, the following about:config +# options should be set (values in <> mean they are the value taken from your +# torrc): +# +# SETTING NAME VALUE +# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> +# extensions.torbutton.block_disk false +# extensions.torbutton.custom.socks_host 127.0.0.1 +# extensions.torbutton.custom.socks_port <SocksPort> +# extensions.torbutton.inserted_button true +# extensions.torbutton.launch_warning false +# extensions.torbutton.loglevel 2 +# extensions.torbutton.logmethod 0 +# extensions.torbutton.settings_method custom +# extensions.torbutton.socks_port <SocksPort> +# extensions.torbutton.use_privoxy false +# extensions.torlauncher.control_port <ControlPort> +# extensions.torlauncher.loglevel 2 +# extensions.torlauncher.logmethod 0 +# extensions.torlauncher.prompt_at_startup false +# extensions.torlauncher.start_tor false +# +# where the '[...]' in the banned_ports option means "leave anything that was +# already in the preference alone, just append the things specified after it". + +# Either set `TOR_CONTROL_PASSWD` before running ./start-tor-browser, or put +# your password in the following line where the word “secret” is: +setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} + +# XXX: Debug mode for Firefox?? + +# not in debug mode, run proceed normally +printf "Launching Tor Messenger for Linux in ${HOME}...\n" +cd "${HOME}" +# XXX Someday we should pass whatever command-line arguments we got +# (probably filenames or URLs) to Firefox. +# !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. +# !!! Use at your own risk! +# Adding --class for fixing bug 11102. +TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird "${@}" +exitcode="$?" +if [ "$exitcode" -ne 0 ]; then + complain "Tor Messenger exited abnormally. Exit code: $exitcode" + exit "$exitcode" +else + printf '\nTor Messenger exited cleanly.\n' +fi

1 0

[tor-messenger-build/master] Temporary workaround for the slash me leak
by arlo＠torproject.org 06 Nov '14

06 Nov '14

commit 0659e27e0a2468334c59f3a79065f09e63d3444c Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Nov 5 21:48:51 2014 -0800 Temporary workaround for the slash me leak --- projects/instantbird/config | 1 + projects/instantbird/slashme.patch | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 35b476c..91414d0 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -43,6 +43,7 @@ input_files: pkg_type: src - filename: preferences.patch - filename: irc.patch + - filename: slashme.patch - filename: xmpp.patch - filename: facebook.patch - filename: accountcreation.patch diff --git a/projects/instantbird/slashme.patch b/projects/instantbird/slashme.patch new file mode 100644 index 0000000..f979fff --- /dev/null +++ b/projects/instantbird/slashme.patch @@ -0,0 +1,44 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1415252765 28800 +# Wed Nov 05 21:46:05 2014 -0800 +# Node ID 17ce33f549af16468fc96d2eb5292a148505479e +# Parent 49fc79e39b9c292d182a46aa800135bd65b6c38f +Slash me hack + + * Temporarily work around this leak until a cleaner solution is found. + +diff --git a/chat/protocols/irc/ircCommands.jsm b/chat/protocols/irc/ircCommands.jsm +--- a/chat/protocols/irc/ircCommands.jsm ++++ b/chat/protocols/irc/ircCommands.jsm +@@ -72,26 +72,20 @@ function setMode(aNickname, aConv, aMode + [aConv.name, (aAdd ? "+" : "-") + aMode, aNick])); + } + + function actionCommand(aMsg, aConv) { + // Don't try to send an empty action. + if (!aMsg || !aMsg.trim().length) + return false; + +- let conv = getConv(aConv); +- let account = getAccount(aConv); +- if (!ctcpCommand(aConv, aConv.name, "ACTION", aMsg)) { +- conv.writeMessage(account._currentServerName, _("error.sendMessageFailed"), +- {error: true, system: true}); +- return true; +- } +- +- // Show the action on our conversation. +- conv.writeMessage(account._nickname, "/me " + aMsg, {outgoing: true}); ++ let conv = Services.conversations.getUIConversation(aConv); ++ if (!conv) ++ return false; ++ conv.sendMsg("/me " + aMsg); + return true; + } + + // This will open the conversation, and send and display the text. + // aReturnedConv is optional and returns the resulting conversation. + function privateMessage(aConv, aMsg, aNickname, aReturnedConv) { + if (!aMsg.length) + return false;

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 06 Nov '14

06 Nov '14

commit 57d1e19a48badc1dba172383a56646e695230695 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 6 01:15:50 2014 +0000 Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index e76606b..f72e094 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Paramètres de confidentialité et de sécurité"> <!ENTITY torbutton.prefs.block_thread "Bloquer la lecture de l'historique pendant l'utilisation de Tor (indispensable)"> <!ENTITY torbutton.prefs.block_thwrite "Bloquer l'écriture à historique pendant l'utilisation de Tor (recommandé)"> <!ENTITY torbutton.prefs.block_nthread "Bloquer la lecture de l'historique en mode non-Tor (facultatif)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> <!ENTITY torbutton.prefs.block_plugins "Désactiver les greffons du navigateur (tels que Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue des autres utilisateurs du Navigateur Tor"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> +<!ENTITY torbutton.prefs.sec_low "Faible (défaut)"> +<!ENTITY torbutton.prefs.sec_med_low "Moyen-Bas"> +<!ENTITY torbutton.prefs.sec_med_high "Moyen-Haut"> +<!ENTITY torbutton.prefs.sec_high "Haut"> +<!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisées">

1 0

[tor/master] Try to fix test_checkdir windows compilation more
by nickm＠torproject.org 05 Nov '14

05 Nov '14

commit 4ae729683d3ddd904993f0ecd663922b26594b79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 5 14:51:17 2014 -0500 Try to fix test_checkdir windows compilation more --- src/test/test_checkdir.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c index b694fd3..185e5fb 100644 --- a/src/test/test_checkdir.c +++ b/src/test/test_checkdir.c @@ -70,6 +70,7 @@ test_checkdir_perms(void *testdata) testdir = get_datadir_fname("checkdir_exists_none"); cpd_chkopts = CPD_CREATE; unix_create_opts = 0700; + (void)unix_create_opts; unix_verify_optsmask = 0077; tt_int_op(0, ==, mkdir(testdir, unix_create_opts)); tt_int_op(0, ==, check_private_dir(testdir, cpd_chkopts, NULL));

1 0

[tor/master] Try to fix test_checkdir windows compilation
by nickm＠torproject.org 05 Nov '14

05 Nov '14

commit bb54d008c25206f5746aba5b522460e90d641a91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 5 14:39:09 2014 -0500 Try to fix test_checkdir windows compilation --- src/test/test_checkdir.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c index 409ba80..b694fd3 100644 --- a/src/test/test_checkdir.c +++ b/src/test/test_checkdir.c @@ -8,6 +8,10 @@ #include "test.h" #include "util.h" +#ifdef _WIN32 +#define mkdir(a,b) mkdir(a) +#endif + /** Run unit tests for private dir permission enforcement logic. */ static void test_checkdir_perms(void *testdata)

1 0