June 2017 - tor-commits - lists.torproject.org

[metrics-web/master] Remove unused ExoneraTor config lines.
by karsten＠torproject.org 30 Jun '17

30 Jun '17

commit 71d2eb30c909ec46f2ec79c99c06ae3141b10ebe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jun 30 10:18:24 2017 +0200 Remove unused ExoneraTor config lines. --- .../java/org/torproject/ernie/cron/Configuration.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java b/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java index 35d52b9..d1bc63b 100644 --- a/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java +++ b/modules/legacy/src/main/java/org/torproject/ernie/cron/Configuration.java @@ -44,11 +44,6 @@ public class Configuration { private boolean writeBridgeStats = false; - private String exoneraTorDatabaseJdbc = "jdbc:postgresql:" - + "//localhost/exonerator?user=metrics&password=password"; - - private String exoneraTorImportDirectory = "exonerator-import/"; - /** Initializes this configuration class. */ public Configuration() { @@ -96,10 +91,6 @@ public class Configuration { } else if (line.startsWith("WriteBridgeStats")) { this.writeBridgeStats = Integer.parseInt( line.split(" ")[1]) != 0; - } else if (line.startsWith("ExoneraTorDatabaseJdbc")) { - this.exoneraTorDatabaseJdbc = line.split(" ")[1]; - } else if (line.startsWith("ExoneraTorImportDirectory")) { - this.exoneraTorImportDirectory = line.split(" ")[1]; } else { logger.severe("Configuration file contains unrecognized " + "configuration key in line '" + line + "'! Exiting!"); @@ -177,13 +168,5 @@ public class Configuration { public boolean getWriteBridgeStats() { return this.writeBridgeStats; } - - public String getExoneraTorDatabaseJdbc() { - return this.exoneraTorDatabaseJdbc; - } - - public String getExoneraTorImportDirectory() { - return this.exoneraTorImportDirectory; - } }

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 30 Jun '17

30 Jun '17

commit d4c15c79257b718f30eb193e500b6c40e187998e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 30 06:48:25 2017 +0000 Update translations for tails-greeter-2 --- cs/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/cs.po b/cs/cs.po index 1967b8f..ce88b4b 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -249,7 +249,7 @@ msgstr "Offline" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." -msgstr "" +msgstr "Nepodařilo se znovu zamknout trvalé úložiště." #: ../tailsgreeter/gui.py:499 msgid "Unlocking…"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 30 Jun '17

30 Jun '17

commit 88977aef70c1c8584725a8eed51fc1047aa346bd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 30 06:45:46 2017 +0000 Update translations for tails-greeter --- cs/cs.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 0cbb210..449bef3 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 12:27+0200\n" -"PO-Revision-Date: 2017-06-30 06:02+0000\n" +"PO-Revision-Date: 2017-06-30 06:28+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -244,7 +244,7 @@ msgstr "Offline" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." -msgstr "" +msgstr "Nepodařilo se znovu zamknout trvalé úložiště." #: ../tailsgreeter/gui.py:499 msgid "Unlocking…"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 30 Jun '17

30 Jun '17

commit d92d875c6aca60140842f1f6f29b688400a4592d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 30 06:18:17 2017 +0000 Update translations for tails-greeter-2 --- cs/cs.po | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 122bc5f..1967b8f 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -138,24 +138,24 @@ msgstr "_Časové pásmo" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "Šifrované _Trvalé úložiště" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Zobrazit heslo" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Konfigurace Trvalého úložiště" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Pro odemknutí trvalého uložiště zadejte heslo" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Odemknout" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" @@ -163,23 +163,23 @@ msgstr "" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." -msgstr "" +msgstr "Trvalé úložiště je odemčeno. Restart Tails ho znovu uzamkne." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" -msgstr "" +msgstr "_Další nastavení" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" -msgstr "" +msgstr "Uložit Další nastavení" #: ../data/greeter.ui.h:38 msgid "Add an additional setting" -msgstr "" +msgstr "Přidat další nastavení" #: ../data/greeter.ui.h:39 msgid "Network Configuration" -msgstr "" +msgstr "Konfigurace sítě" #: ../data/greeter.ui.h:40 msgid "" @@ -187,14 +187,17 @@ msgid "" "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." msgstr "" +"Pokud je vaše internetové připojení cenzurováno, filtrováno nebo využívá " +"proxy, můžete nakonfigurovat přemostění Tor nebo místní proxy. Chcete-li " +"pracovat zcela offline, můžete zakázat všechna síťová připojení." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Připojit se přímo k síti Tor (výchozí)" #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "" +msgstr "Konfigurace přemostění TOR nebo místní proxy" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -205,14 +208,16 @@ msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." msgstr "" +"Výchozí nastavení je ve většině situací bezpečné. Chcete-li přidat vlastní " +"nastavení, stiskněte níže tlačítko \"+\"." #: ../data/greeter.ui.h:45 msgid "_Administration Password" -msgstr "" +msgstr "_Heslo pro správu" #: ../data/greeter.ui.h:46 msgid "Off (default)" -msgstr "" +msgstr "Vypnuto (výchozí)" #: ../data/greeter.ui.h:47 msgid "_MAC Address Spoofing" @@ -220,19 +225,19 @@ msgstr "" #: ../data/greeter.ui.h:48 msgid "On (default)" -msgstr "" +msgstr "Zapnuto (výchozí)" #: ../data/greeter.ui.h:49 msgid "_Network Connection" -msgstr "" +msgstr "_Síťová připojení" #: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385 msgid "Direct (default)" -msgstr "" +msgstr "Přímo (výchozí)" #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "" +msgstr "_Windows Kamufláž" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 30 Jun '17

30 Jun '17

commit ed9b74f888f222beef5a5d4883002840c4c1f918 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 30 06:15:41 2017 +0000 Update translations for tails-greeter --- cs/cs.po | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index f55a73f..0cbb210 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 12:27+0200\n" -"PO-Revision-Date: 2017-06-30 05:45+0000\n" +"PO-Revision-Date: 2017-06-30 06:02+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -89,13 +89,13 @@ msgstr "" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Nelze odemknout šifrované úložiště s tímto přístupovým heslem." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." -msgstr "" +msgstr "Po připojení k síti nakonfigurujete přemostění Tor a lokální proxy." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" @@ -122,40 +122,40 @@ msgstr "Uložit nastavení pro jazyk a region" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Jazyk" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Rozložení kláves" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Formáty" #: ../data/greeter.ui.h:28 msgid "_Time Zone" -msgstr "" +msgstr "_Časové pásmo" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "Šifrované _Trvalé úložiště" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Zobrazit heslo" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Konfigurace Trvalého úložiště" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Pro odemknutí trvalého uložiště zadejte heslo" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Odemklnout" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" @@ -163,38 +163,38 @@ msgstr "" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." -msgstr "" +msgstr "Trvalé úložiště je odemčeno. Restart Tails ho znovu uzamkne." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" -msgstr "" +msgstr "_Další nastavení" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" -msgstr "" +msgstr "Uložit Další nastavení" #: ../data/greeter.ui.h:38 msgid "Add an additional setting" -msgstr "" +msgstr "Přidat další nastavení" #: ../data/greeter.ui.h:39 msgid "Network Configuration" -msgstr "" +msgstr "Konfigurace sítě" #: ../data/greeter.ui.h:40 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." -msgstr "" +msgstr "Pokud je vaše internetové připojení cenzurováno, filtrováno nebo využívá proxy, můžete nakonfigurovat přemostění Tor nebo místní proxy. Chcete-li pracovat zcela offline, můžete zakázat všechna síťová připojení." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Připojit se přímo k síti Tor (výchozí)" #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "" +msgstr "Konfigurace přemostění TOR nebo místní proxy" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -204,15 +204,15 @@ msgstr "Zakázat všechny sítě" msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." -msgstr "" +msgstr "Výchozí nastavení je ve většině situací bezpečné. Chcete-li přidat vlastní nastavení, stiskněte níže tlačítko \"+\"." #: ../data/greeter.ui.h:45 msgid "_Administration Password" -msgstr "" +msgstr "_Heslo pro správu" #: ../data/greeter.ui.h:46 msgid "Off (default)" -msgstr "" +msgstr "Vypnuto (výchozí)" #: ../data/greeter.ui.h:47 msgid "_MAC Address Spoofing" @@ -220,19 +220,19 @@ msgstr "" #: ../data/greeter.ui.h:48 msgid "On (default)" -msgstr "" +msgstr "Zapnuto (výchozí)" #: ../data/greeter.ui.h:49 msgid "_Network Connection" -msgstr "" +msgstr "_Síťová připojení" #: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385 msgid "Direct (default)" -msgstr "" +msgstr "víchozí" #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "" +msgstr "_Windows Kamufláž" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 30 Jun '17

30 Jun '17

commit 536e361e3870b3ac402d2088632dde844851bfcb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 30 05:48:18 2017 +0000 Update translations for tails-greeter-2 --- cs/cs.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index f401aa2..122bc5f 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -28,6 +28,8 @@ msgid "" "tasks. Otherwise, the administration password is disabled for better " "security." msgstr "" +"Pokud potřebujete provádět úkoly správy, nastavte administrátorské heslo. V " +"opačném případě je heslo pro správu zakázáno pro lepší zabezpečení." #: ../data/greeter.ui.h:3 msgid "Enter an administration password" @@ -87,13 +89,13 @@ msgstr "" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "Nelze odemknout šifrované úložiště s tímto přístupovým heslem." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." -msgstr "" +msgstr "Po připojení k síti nakonfigurujete přemostění Tor a lokální proxy." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" @@ -120,19 +122,19 @@ msgstr "Uložit nastavení pro jazyk a region" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Jazyk" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Rozložení kláves" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Formáty" #: ../data/greeter.ui.h:28 msgid "_Time Zone" -msgstr "" +msgstr "_Časové pásmo" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 30 Jun '17

30 Jun '17

commit 248af93ae7e9557d0a2168f5478d65af7f120c47 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 30 05:45:41 2017 +0000 Update translations for tails-greeter --- cs/cs.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 3a07043..f55a73f 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-10 12:27+0200\n" -"PO-Revision-Date: 2017-06-27 06:20+0000\n" +"PO-Revision-Date: 2017-06-30 05:45+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgid "" "Set up an administration password if you need to perform administrative " "tasks. Otherwise, the administration password is disabled for better " "security." -msgstr "" +msgstr "Pokud potřebujete provádět úkoly správy, nastavte administrátorské heslo. V opačném případě je heslo pro správu zakázáno pro lepší zabezpečení." #: ../data/greeter.ui.h:3 msgid "Enter an administration password"

1 0

[stem/master] Stop generating too-long nicknames
by atagar＠torproject.org 30 Jun '17

30 Jun '17

commit 7d157f9ad852b3f2020df45fb35a18accaef23fa Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jun 29 18:38:18 2017 -0400 Stop generating too-long nicknames Some platforms have sys.maxint large enough that the random router nicknames were too long (especially for BridgeDescriptor). Factor out the random nickname generation into _random_nickname() and use it consistently. --- stem/descriptor/__init__.py | 5 +++++ stem/descriptor/server_descriptor.py | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index f293c6c..5f8d1ca 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -46,6 +46,7 @@ import os import random import re import string +import sys import tarfile import stem.prereq @@ -1055,6 +1056,10 @@ def _random_crypto_blob(block_type = None): return crypto_blob +def _random_nickname(): + return ('Unnamed%i' % random.randint(0, sys.maxint))[:19] + + def _descriptor_components(raw_contents, validate, extra_keywords = (), non_ascii_fields = ()): """ Initial breakup of the server descriptor contents to make parsing easier. diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 8228b1d..5826bb6 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -35,9 +35,7 @@ import base64 import binascii import functools import hashlib -import random import re -import sys import stem.descriptor.certificate import stem.descriptor.extrainfo_descriptor @@ -71,6 +69,7 @@ from stem.descriptor import ( _random_ipv4_address, _random_date, _random_crypto_blob, + _random_nickname, ) try: @@ -806,10 +805,8 @@ class RelayDescriptor(ServerDescriptor): if attr is None: attr = {} - nickname = ('Unnamed%i' % random.randint(0, sys.maxint))[:19] - base_header = ( - ('router', '%s %s 9001 0 0' % (nickname, _random_ipv4_address())), + ('router', '%s %s 9001 0 0' % (_random_nickname(), _random_ipv4_address())), ('published', _random_date()), ('bandwidth', '153600 256000 104590'), ('reject', '*:*'), @@ -927,7 +924,7 @@ class BridgeDescriptor(ServerDescriptor): raise NotImplementedError('Signing of %s not implemented' % cls.__name__) return _descriptor_content(attr, exclude, sign, ( - ('router', 'Unnamed%s %s 9001 0 0' % (random.randint(0, sys.maxint), _random_ipv4_address())), + ('router', '%s %s 9001 0 0' % (_random_nickname(), _random_ipv4_address())), ('router-digest', '006FD96BA35E7785A6A3B8B75FE2E2435A13BDB4'), ('published', _random_date()), ('bandwidth', '409600 819200 5120'),

1 0

[snowflake/master] Have proxy-go log in UTC.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit bfea72b50e9277be0abae1b696431c28faef681c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 16:44:17 2017 -0700 Have proxy-go log in UTC. --- proxy-go/snowflake.go | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 1b7d593..d25a491 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -305,6 +305,7 @@ func main() { flag.StringVar(&logFilename, "log", "", "log filename") flag.Parse() + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE | os.O_WRONLY | os.O_APPEND, 0600) if err != nil {

1 0

[meek/master] Update client shutdown procedure.
by dcf＠torproject.org 29 Jun '17

29 Jun '17

commit 0ec986eb2b4bc23d81e6e8beffd382890f55bfb1 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 29 16:43:01 2017 -0700 Update client shutdown procedure. Ignore SIGINT, handle TOR_PT_EXIT_ON_STDIN_CLOSE. --- meek-client-torbrowser/meek-client-torbrowser.go | 2 +- meek-client/meek-client.go | 34 +++++++++++++----------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index cbbf9ca..691a566 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -308,7 +308,7 @@ func main() { signal.Notify(make(chan os.Signal, 1), syscall.SIGPIPE) sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigChan, syscall.SIGTERM) // Unset environment variables that Firefox sets after a restart (as // caused by, for example, an update or the installation of an add-on). diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index c3eadc4..9a818d0 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -36,6 +36,7 @@ import ( "flag" "fmt" "io" + "io/ioutil" "log" "net" "net/http" @@ -441,9 +442,19 @@ func main() { var numHandlers int = 0 var sig os.Signal sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigChan, syscall.SIGTERM) - // Wait for first signal. + if os.Getenv("TOR_PT_EXIT_ON_STDIN_CLOSE") == "1" { + // This environment variable means we should treat EOF on stdin + // just like SIGTERM: https://bugs.torproject.org/15435. + go func() { + io.Copy(ioutil.Discard, os.Stdin) + log.Printf("synthesizing SIGTERM because of stdin close") + sigChan <- syscall.SIGTERM + }() + } + + // Keep track of handlers and wait for a signal. sig = nil for sig == nil { select { @@ -453,23 +464,14 @@ func main() { log.Printf("got signal %s", sig) } } + for _, ln := range listeners { ln.Close() } - - if sig == syscall.SIGTERM { - log.Printf("done") - return - } - - // Wait for second signal or no more handlers. - sig = nil - for sig == nil && numHandlers != 0 { - select { - case n := <-handlerChan: - numHandlers += n - case sig = <-sigChan: - log.Printf("got second signal %s", sig) + for n := range handlerChan { + numHandlers += n + if numHandlers == 0 { + break } }

1 0