December 2013 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-24.2.0esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit d4fac5bc054c8d6130bfd5d7c07d45e6a80e543c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 11 19:29:23 2013 -0800 fixup! Tor Browser's Firefox preference overrides. The damn datareporting service still asks you if you want to report data unless you set all three of these prefs (even though datareporting.healthreport.service.enabled is supposed to disable all of it). --- browser/app/profile/000-tor-browser.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 63440c4..1d30d34 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -40,7 +40,9 @@ pref("browser.safebrowsing.enabled", false); pref("browser.safebrowsing.malware.enabled", false); pref("browser.download.manager.scanWhenDone", false); // prevents AV remote reporting of downloads pref("extensions.ui.lastCategory", "addons://list/extension"); -pref("datareporting.healthreport.service.enabled", false); +pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set +pref("datareporting.healthreport.uploadEnabled", false); +pref("datareporting.policy.dataSubmissionEnabled", false); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched // Fingerprinting

1 0

r26469: {website} Made loose information about proxychains into an FAQ entry; (website/trunk/docs/en)
by Matt Pagan 11 Dec '13

11 Dec '13

Author: mttp Date: 2013-12-11 23:15:13 +0000 (Wed, 11 Dec 2013) New Revision: 26469 Modified: website/trunk/docs/en/faq.wml Log: Made loose information about proxychains into an FAQ entry; other additions. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2013-12-11 05:52:12 UTC (rev 26468) +++ website/trunk/docs/en/faq.wml 2013-12-11 23:15:13 UTC (rev 26469) @@ -77,7 +77,7 @@ unsafe?</a></li> <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc with Tor.</a></li> - <li><a href="#TorbuttonOtherBrowser">Will Torbutton be available for other browsers?</a></li> + <li><a href="#TorbuttonOtherBrowser">Will Torbutton be available for other browsers?</a></li> <li><a href="#TBBCloseBrowser">I want to leave Tor Browser Bundle running but close the browser.</a></li> @@ -213,6 +213,8 @@ things?</a></li> <li><a href="#RespondISP">How do I respond to my ISP about my exit relay?</a></li> + <li><a href="#HelpPoliceOrLawyers">I have questions about + a Tor IP address for a legal case.</a></li> </ul> <p>For other questions not yet on this version of the FAQ, see the @@ -539,10 +541,8 @@ <a id="Forum"></a> <h3><a class="anchor" href="#Forum">Is there a Tor forum?</a></h3> - <p>Not yet, but we're working on it. Most forum software is - a disaster to maintain and keep secure, and at the same time - too many of the Tor developers are spread too thin to be able - to contribute enough to a forum. + <p>We have <a href="https://tor.stackexchange.com/">a StackExchange + page</a> that is currently in public beta. </p> <hr> @@ -3138,8 +3138,8 @@ We've made quite a bit of progress on this problem lately. You can read more details on the <a href="https://www.torproject.org/docs/pluggable-transports.html.en"> pluggable transports page</a>. You may also be interested in -<a href="https://www.youtube.com/watch?v=GwMr8Xl7JMQ">Roger and Jake's talk at -28C3</a>, or <a href="https://www.youtube.com/watch?v=JZg1nqs793M">Runa's +<a href="https://www.youtube.com/watch?v=GwMr8Xl7JMQ">Roger and Jake's talk at +28C3</a>, or <a href="https://www.youtube.com/watch?v=JZg1nqs793M">Runa's talk at 44con</a>. </p> @@ -3155,7 +3155,7 @@ These attacks come from examining characteristics of the IP headers or TCP headers and looking for information leaks based on individual hardware signatures. One example is the -<a href="http://www.caida.org/outreach/papers/2005/fingerprinting/"> +<a href="http://www.caida.org/outreach/papers/2005/fingerprinting/"> Oakland 2005 paper</a> that lets you learn if two packet streams originated from the same hardware, but only if you can see the original TCP timestamps. </p> @@ -3170,6 +3170,35 @@ <hr> + <a id="Proxychains"></a> + <h3><a class="anchor" href="#Proxychains">Aren't 10 proxies + (proxychains) better than Tor with only 3 hops?</a></h3> + + <p> + Proxychains is a program that sends your traffic through a series of + open web proxies that you supply before sending it on to your final + destination. <a href="#KeyManagement">Unlike Tor</a>, proxychains + does not encrypt the connections between each proxy. An open proxy + that wanted to monitor your connection can see all the other proxy + servers you wanted to use between itself and your final destination, + as well as the IP address that proxy hop receives traffic from. + </p> + <p> + Because the <a + href="https://gitweb.torproject.org/torspec.git?a=blob_plain;hb=HEAD;f=tor-spec.t…"> + Tor protocol</a> requires encrypted relay-to-relay connections, not + even a misbehaving relay can see the entire path of any Tor user. + </p> + <p> + While Tor relays are run by volunteers and checked periodically for + suspicious behavior, many open proxies that can be found with a search + engine are worm-compromised machines, misconfigured private proxies + not intended for public use, or honeypots set up to exploit users. + </p> + + <hr> + + <a id="AttacksOnOnionRouting"></a> <h3><a class="anchor" href="#AttacksOnOnionRouting">What attacks remain against onion routing?</a></h3> @@ -3671,6 +3700,27 @@ <hr> + <a id="HelpPoliceOrLawyers"></a> + <h3><a class="anchor" href="#HelpPoliceOrLawyers">I have questions about + a Tor IP address for a legal case.</a></h3> + + <p> + Please read the <a + href="https://www.torproject.org/eff/tor-legal-faq">legal FAQ written + by EFF lawyers</a>. There's a growing <a + href="https://blog.torproject.org/blog/start-tor-legal-support-directory">legal + directory</a> of people who may be able to help you. + </p> + + <p> + If you need to check if a certain IP address was acting as a Tor exit + node at a certain date and time, you can use the <a + href="https://exonerator.torproject.org/">ExoneraTor tool</a> to query the + historic Tor relay lists and get an answer. + </p> + + <hr> + </div>  <div id = "sidecol">

1 0

[flashproxy/master] update ChangeLog for recent merges and commits
by infinity0＠torproject.org 11 Dec '13

11 Dec '13

commit 91282e4ca9e1ae4d6b12fb617ef63d1c62bff84d Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Dec 11 15:15:13 2013 +0000 update ChangeLog for recent merges and commits --- ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0a96dce..55b0013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ + o Add manpages for the facilitator and nodejs proxy, automatically + generated by help2man. + + o Have nodejs flashproxy take GNU-style long command-line options. + + o Automate much of the configuration tasks involved in installing the + facilitator using GNU autotools. See facilitator/INSTALL for details + on the new process. Also move some common code here into the common + python module. Patch by Ximin Luo. Fixes bug 9974. + + o Move common code to a separate flashproxy-common python module. Also + split out some build scripts so distro packagers have an easier + time. Patch by Ximin Luo. Fixes bug 6810. + o Enabled binary frames (avoiding the overhead of base64 encoding) for Firefox 11 and later. Patch by Arlo Breault. Fixes bug 9069.

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 Dec '13

11 Dec '13

commit 8d245d3b40ab3bf0acf173e2909bdd9a319e295b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 11 11:46:13 2013 +0000 Update translations for tails-misc --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index b5900f2..e510dce 100644 --- a/cs.po +++ b/cs.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-06 11:47+0100\n" -"PO-Revision-Date: 2013-12-11 11:14+0000\n" +"PO-Revision-Date: 2013-12-11 11:20+0000\n" "Last-Translator: jui <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 Dec '13

11 Dec '13

commit d4d1f9e4b3f8205cdc69ddf2690143d60afe0355 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 11 11:16:14 2013 +0000 Update translations for tails-misc --- cs.po | 87 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/cs.po b/cs.po index c37b7e7..b5900f2 100644 --- a/cs.po +++ b/cs.po @@ -4,13 +4,14 @@ # # Translators: # adamse <adamslovacek(a)gmail.com>, 2013 +# jui <appukonrad(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-26 23:41+0200\n" -"PO-Revision-Date: 2013-11-06 09:01+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2013-12-06 11:47+0100\n" +"PO-Revision-Date: 2013-12-11 11:14+0000\n" +"Last-Translator: jui <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,7 +77,7 @@ msgstr "Neznámá důvěra" #: config/chroot_local-includes/usr/local/bin/gpgApplet:300 msgid "Marginal Trust" -msgstr "" +msgstr "Marginální důvěra" #: config/chroot_local-includes/usr/local/bin/gpgApplet:302 msgid "Full Trust" @@ -174,7 +175,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:742 msgid "GnuPG error" -msgstr "" +msgstr "Chyba GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:763 msgid "Therefore the operation cannot be performed." @@ -186,7 +187,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:819 msgid "Output of GnuPG:" -msgstr "" +msgstr "Výstup z GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:844 msgid "Other messages provided by GnuPG:" @@ -194,11 +195,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 msgid "Shutdown Immediately" -msgstr "" +msgstr "Vypnout okamžitě" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:35 msgid "Reboot Immediately" -msgstr "Restartovat teď" +msgstr "Restartovat okamžitě" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 msgid "Shutdown Helper" @@ -211,7 +212,7 @@ msgstr "nedostupné" #: config/chroot_local-includes/usr/local/bin/tails-about:16 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "" +msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:17 msgid "The Amnesic Incognito Live System" @@ -226,25 +227,25 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:20 msgid "About Tails" -msgstr "" +msgstr "O Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "Your additional software" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 msgid "The upgrade was successful." -msgstr "" +msgstr "Aktualizace byla úspěšná." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" @@ -304,7 +305,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" -msgstr "" +msgstr "Varování: zjištěn virtuální stroj!" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" @@ -319,79 +320,79 @@ msgid "" " more...</a>" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" msgstr "chyba:" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Error" msgstr "Chyba" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:69 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67 msgid "warning:" msgstr "varování:" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Warning" msgstr "Varování" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "" +msgstr "Opravdu chcete spustit Nebezpečný prohlížeč?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:80 msgid "_Launch" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81 msgid "_Exit" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91 msgid "Starting the Unsafe Browser..." -msgstr "" +msgstr "Spoštění nebezpečného prohlížeče..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "This may take a while, so please be patient." -msgstr "" +msgstr "Může to nějakou dobu trvat, takže buďte trpěliví." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110 msgid "Failed to setup chroot." msgstr "Nepodařilo se nastavit \"chroot\"" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" -msgstr "" +msgstr "Nebezpečný prohlížeč" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 msgid "Shutting down the Unsafe Browser..." -msgstr "" +msgstr "Ukončování nebezpečného prohlížeče..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:223 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:234 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:235 msgid "Failed to restart Tor." msgstr "Znovuspuštění TORu nebylo úspěšné" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:242 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:243 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:255 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:256 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." @@ -409,11 +410,11 @@ msgstr "" #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" -msgstr "" +msgstr "Nahlásit chybu" #: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 msgid "Tails documentation" -msgstr "" +msgstr "Dokumentace Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " @@ -421,7 +422,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 msgid "i2p" -msgstr "" +msgstr "i2p" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 msgid "Anonymous overlay network"

1 0

[tor-browser-bundle/master] Bug 10354: Fix localization issues with OSX and Windows.
by mikeperry＠torproject.org 11 Dec '13

11 Dec '13

commit 5b71529a66b7fb803d740ecb35a688c6586150f5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 11 02:56:50 2013 -0800 Bug 10354: Fix localization issues with OSX and Windows. We forgot to copy the additional omni.ja haxx into the localization loop. --- gitian/descriptors/mac/gitian-bundle.yml | 9 ++++++++- gitian/descriptors/windows/gitian-bundle.yml | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 2ef8834..edcc6d5 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -130,12 +130,19 @@ script: | cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. + # FF24 puts the prefs in a different jar: + if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then + pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + else + pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + fi + cd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../../../../ + popd ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip TorBrowserBundle_$LANG.app rm -rf TorBrowserBundle_$LANG.app diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 5ee9056..f56c15d 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -129,12 +129,18 @@ script: | cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - cd "Tor Browser"/Browser + # FF24 puts the prefs in a different jar: + if [ -f "Tor Browser"/Browser/browser/omni.ja ]; then + pushd "Tor Browser"/Browser/browser/ + else + pushd "Tor Browser"/Browser/ + fi + mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../ + popd makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe

1 0

[goptlib/master] fmt
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit 16617bac2950f6b9aa4c383dee34a093e159a83f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 11 00:06:29 2013 -0800 fmt --- pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.go b/pt.go index 313a0c9..eae604d 100644 --- a/pt.go +++ b/pt.go @@ -559,7 +559,7 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { } // Need either OrAddr or ExtendedOrAddr. - if (info.OrAddr == nil && (info.ExtendedOrAddr == nil || info.AuthCookie == nil)) { + if info.OrAddr == nil && (info.ExtendedOrAddr == nil || info.AuthCookie == nil) { err = envError("need TOR_PT_ORPORT or TOR_PT_EXTENDED_SERVER_PORT environment variable") return }

1 0

[goptlib/master] Consistent declarations.
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit dfee1a81067afdea57b78c32c290d955e70b8533 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 10 23:35:47 2013 -0800 Consistent declarations. --- pt.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt.go b/pt.go index 3478905..313a0c9 100644 --- a/pt.go +++ b/pt.go @@ -541,7 +541,7 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { } } - var extendedOrPort = getenv("TOR_PT_EXTENDED_SERVER_PORT") + extendedOrPort := getenv("TOR_PT_EXTENDED_SERVER_PORT") if extendedOrPort != "" { info.ExtendedOrAddr, err = resolveAddr(extendedOrPort) if err != nil { @@ -549,7 +549,7 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { return } } - var authCookieFilename = getenv("TOR_PT_AUTH_COOKIE_FILE") + authCookieFilename := getenv("TOR_PT_AUTH_COOKIE_FILE") if authCookieFilename != "" { info.AuthCookie, err = readAuthCookieFile(authCookieFilename) if err != nil {

1 0

[goptlib/master] Rearrange some assignments.
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit 8d092aa5bb26b6d5db39fb8b94029726f580371f Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 10 23:15:24 2013 -0800 Rearrange some assignments. --- pt.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pt.go b/pt.go index 50a2e1f..d0ce0b8 100644 --- a/pt.go +++ b/pt.go @@ -527,18 +527,18 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { } line("VERSION", ver) - orPort, err := getenvRequired("TOR_PT_ORPORT") + info.Bindaddrs, err = getServerBindaddrs(methodNames) if err != nil { return } - info.OrAddr, err = resolveAddr(orPort) + + orPort, err := getenvRequired("TOR_PT_ORPORT") if err != nil { - err = envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) return } - - info.Bindaddrs, err = getServerBindaddrs(methodNames) + info.OrAddr, err = resolveAddr(orPort) if err != nil { + err = envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) return } @@ -550,7 +550,6 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { return } } - var authCookieFilename = getenv("TOR_PT_AUTH_COOKIE_FILE") if authCookieFilename != "" { info.AuthCookie, err = readAuthCookieFile(authCookieFilename)

1 0

[goptlib/master] Make TOR_PT_ORPORT optional if we have TOR_PT_EXTENDED_SERVER_PORT.
by dcf＠torproject.org 11 Dec '13

11 Dec '13

commit ff98b14e76c10481c6e82266c7dfea93a4701f97 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 10 23:30:13 2013 -0800 Make TOR_PT_ORPORT optional if we have TOR_PT_EXTENDED_SERVER_PORT. --- pt.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pt.go b/pt.go index d0ce0b8..9ac14e5 100644 --- a/pt.go +++ b/pt.go @@ -532,14 +532,13 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { return } - orPort, err := getenvRequired("TOR_PT_ORPORT") - if err != nil { - return - } - info.OrAddr, err = resolveAddr(orPort) - if err != nil { - err = envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) - return + orPort := getenv("TOR_PT_ORPORT") + if orPort != "" { + info.OrAddr, err = resolveAddr(orPort) + if err != nil { + err = envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) + return + } } var extendedOrPort = getenv("TOR_PT_EXTENDED_SERVER_PORT") @@ -559,6 +558,12 @@ func ServerSetup(methodNames []string) (info ServerInfo, err error) { } } + // Need either OrAddr or ExtendedOrAddr. + if (info.OrAddr == nil && (info.ExtendedOrAddr == nil || info.AuthCookie == nil)) { + err = envError("need TOR_PT_ORPORT or TOR_PT_EXTENDED_SERVER_PORT environment variable") + return + } + return info, nil }

1 0