tor-commits January 2014

tor-commits@lists.torproject.org

23 participants
2271 discussions

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit ff58fc70ea79d8055a2e0ff5eae269b2cceab2e9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 07:45:07 2014 +0000 Update translations for orbot --- values-km/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/values-km/strings.xml b/values-km/strings.xml index 5238f2b..3678652 100644 --- a/values-km/strings.xml +++ b/values-km/strings.xml @@ -2,7 +2,9 @@ <resources> <string name="menu_info">Help</string> <string name="menu_start">ចាប់ផ្ដើម</string> + <string name="menu_about">អំពី</string> <string name="button_help">Help</string> + <string name="button_about">អំពី</string> <string name="menu_verify">ពិនិត្យ</string> <string name="menu_exit">ចាកចេញ</string> <string name="btn_cancel">Cancel</string> @@ -19,5 +21,6 @@ <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string>-->  + <string name="status">ស្ថានភាព</string> <string name="default_bridges"></string> </resources>

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 5f46ac565c008b7d3fb5cf6619704157750f28a7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 07:16:15 2014 +0000 Update translations for tails-misc --- km.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/km.po b/km.po index 3a1c61c..aeb358f 100644 --- a/km.po +++ b/km.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# soksophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-27 03:30+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-27 07:15+0000\n" +"Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,19 +42,19 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "" +msgstr "<h1>ááœáâááœáâááŸáâááŸáááážâááâááá á»á!</h1>\n<p>Read <a href=\"%s\">ááááááážâáááá¶áâá¢ááážâááááâáá¶ááá¶áááâááá á»áâááááâááŸá</a>á</p>\n<p><strong>áá»áâáááááŒáâáááááá¶áâáááá¶ááááááœáâááááŸáâáá¶áâáá¶áâáá¶ááá¶á!</strong></p>\n<h2>á¢ááážâáá¶áâáááááâá¢á¶áááááá¶áâá¢áážááá</h2>\n<p>ááŸâá¢áááâáá·áâáááâáá¶ááâáá ááŒáâáááááâá¢áááááááá¶áâááááâá¢áááâááááá áááá¶ááâá¢áááâá¢áá·áááááá Tails ááŒááá¶á á¢áááâá¢á¶áâáááááâá¢á¶áááááá¶áâá¢áážáááâááŸáááážâá²ááâááŸáâááœáâáááá ¢á·áâá¢ááážâááá á»áá áááááá¶ááâáááááŒáâáá¶áááááááá¹á PGP áá¶áá¶áááâáááâá¢áá»áááá¶áâá²ááâááœáâááŸáâáá¶ááâáááâááŒáâááááá¶ááâáááá¶ááááááâá¢áá¶ááá</p>\n<p>á¢áááâáááâá¢á¶áâááŸáâááŸáâáááááŸáâááâááá áá¹áâááááá·áááá¶áâáá¶âá¢áááâááºáá¶âá¢áááááááŸ Tails á ááŸâá¢áááâáá»ááá·áááâá¢áážáááºáá·á áá·áâáááá»áá áá»áâáááááâáááá¶ááááâáááá¢ááâáááá»áááâááááâá¢áááâááááá·áâáá¶?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "á¢á¶áááááááâáá¶áâáá¶ááâáááâááŒá OpenPGP" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit" -msgstr "áá¶áááá" +msgstr "ááá" #: config/chroot_local-includes/usr/local/bin/gpgApplet:141 msgid "About" -msgstr "" +msgstr "á¢áááž" #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit f6b32b841ab4c4bf6952d201dd149e12d7c3e999 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 07:15:53 2014 +0000 Update translations for https_everywhere --- km/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km/ssl-observatory.dtd b/km/ssl-observatory.dtd index 9cd467a..5976430 100644 --- a/km/ssl-observatory.dtd +++ b/km/ssl-observatory.dtd @@ -30,9 +30,9 @@ to turn it on?">--> "áá¶ááâááááŸ á áŸáâáá·áá·áááááŸáâáá·áááá¶ááááááâáááâáá¶áâáá»áâá ááááááá¶ââááá root CAs áá·áâááááááá¶áâ"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> +"áá¶âáá¶âáá»ááááá·áá¶á (á áŸáâáá¶âáááá·áâááá¢âááœá) ááŸáááážâááŸáâáááááŸáâááá, áá»ááááá¶ááâá¢áááâááááŸâááááá¶áâááááá·ááááá·áá¶áâáááâáááá¶á á¬âáááááá·ááž Kaspersky antivirus áááâááááœááá·áá·áááâáá¶áâáá»áááâááááâá¢áááââáááâááááŸâááááŒááááž TLS áá·áâ root Certificate Authority á ááááá·áááŸâá¢áááâáá¶áâááŸáâááŸâááááá¶áâ, áááááŸáâáááâá¢á¶áâááááá»áááâáááá¶áâááááá»áá¶áâááá https:// áá¶ááœáâáááâáááá»áâááááŒáâáá¶áââáááááá¶âáá¶áâáááâááááŒáááážâááá, áá áâáá¶áâááâáá·áááá¶ááááááâáá¶áâááááœá áá¶âááœáâááâááá·áá ááŒáááááâááŸáâááááááâáá¶âáá¶áâáááá¶áááŸáá"> -<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous "áá·áá·áááááŸáâáá·áááá¶ááááááâáááâááááŸ Tor ááááá¶ááâá¢áá¶áá·áâáá¶áâ"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable "Check certificates using Tor for anonymity (requires Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip

1 0

[goptlib/master] Compatibility with go 1.0.3.
by dcf＠torproject.org 27 Jan '14

27 Jan '14

commit abeea884f554b4119ebd84974c612c0dca6ce941 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jan 26 22:19:36 2014 -0800 Compatibility with go 1.0.3. The older go doesn't detect that all paths lead to a return statement. src/git.torproject.org/pluggable-transports/goptlib.git/pt.go:328: function ends without a return statement --- pt.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pt.go b/pt.go index 181097e..1e85f8d 100644 --- a/pt.go +++ b/pt.go @@ -332,9 +332,8 @@ func getClientTransports(star []string) ([]string, error) { } if clientTransports == "*" { return star, nil - } else { - return strings.Split(clientTransports, ","), nil } + return strings.Split(clientTransports, ","), nil } // This structure is returned by ClientSetup. It consists of a list of method

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit a6dbfca430be37a8ab1a6b563f5edb438bdcc561 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 04:45:54 2014 +0000 Update translations for https_everywhere --- km/ssl-observatory.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/ssl-observatory.dtd b/km/ssl-observatory.dtd index a0a2a2c..9cd467a 100644 --- a/km/ssl-observatory.dtd +++ b/km/ssl-observatory.dtd @@ -20,14 +20,14 @@ to turn it on?">-->  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"It is safe to enable this, unless you use a very -intrusive corporate network:"> +"វាមានសុវត្ថិភាពក្នុងការបើកវា, លុះត្រាតែអ្នកប្រើ +បណ្ដាញប្រតិបត្តិការដែលរំខាន៖"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Safe, unless you use a corporate network with secret intranet server names:"> +"លុះត្រាតែអ្នកប្រើបណ្ដាញប្រតិបត្តិដែលមានឈ្មោះម៉ាស៊ីនមេបណ្ដាញកុំព្យូទ័រសម្ងាត់, សុវត្ថិភាព៖"> <!ENTITY ssl-observatory.prefs.alt_roots -"Submit and check certificates signed by non-standard root CAs"> +"ដាក់ស្នើ ហើយពិនិត្យមើលវិញ្ញាបនបត្រដែលបានចុះហត្ថលេខាដោយ root CAs មិនស្តង់ដារ"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip "It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default.">

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit da0d6520e2009e4edf094b05ce126420204c854c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 04:16:15 2014 +0000 Update translations for mat-gui_completed --- km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km.po b/km.po index 6f91090..7a40013 100644 --- a/km.po +++ b/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-27 03:41+0000\n" +"PO-Revision-Date: 2014-01-27 03:50+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 2d1442e0fa304e90b62af7bb73c407e7d2fc8f67 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 04:16:13 2014 +0000 Update translations for mat-gui --- km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km.po b/km.po index 6f91090..7a40013 100644 --- a/km.po +++ b/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-27 03:41+0000\n" +"PO-Revision-Date: 2014-01-27 03:50+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit c2d83dc09a0515d7ce207c5466e8b911d736e643 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 04:16:01 2014 +0000 Update translations for https_everywhere_completed --- km/https-everywhere.dtd | 2 +- km/https-everywhere.properties | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index ee51d78..4123070 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -42,6 +42,6 @@ <!ENTITY https-everywhere.popup.keep "រក្សាទុកខ្ញុំនៅលើកំណែការអភិវឌ្ឍន"> <!ENTITY https-everywhere.popup.revert "ទាញយកកំណែថេរថ្មីបំផុត"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "ការសាកល្បង HTTPS Everywhere Ruleset"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "ចាប់ផ្ដើម"> diff --git a/km/https-everywhere.properties b/km/https-everywhere.properties new file mode 100644 index 0000000..85c930b --- /dev/null +++ b/km/https-everywhere.properties @@ -0,0 +1,8 @@ +https-everywhere.menu.globalEnable = បើក HTTPS Everywhere +https-everywhere.menu.globalDisable = បិទ HTTPS Everywhere +https-everywhere.menu.enableDisable = បើក / បិទ បន្ទាត់ +https-everywhere.menu.noRules = (គ្មានបន្ទាត់សម្រាប់ទំព័រនេះទេ) +https-everywhere.menu.unknownRules = (មិនស្គាល់បន្ទាត់សម្រាប់ទំព័រនេះ) +https-everywhere.toolbar.hint = HTTPS Everywhere គឺសកម្មឥឡូវនេះ។ អ្នកអាចបិទ/បើក វាតាមផ្នែក ដោយចុចរូបតំណាងរបារអាសយដ្ឋាន។ +https-everywhere.migration.notification0 = ដើម្បីប្រតិបត្តិការការកែចាំបាច់, ធ្វើបច្ចុប្បន្នភាពការកំណត់ចំណូលចិត្ត HTTPS Everywhere rule របស់អ្នកឡើងវិញចំពោះតម្លៃលំនាំដើមរបស់វា។ +https-everywhere.menu.ruleset-tests = ដំណើរការការសាកល្បង HTTPS Everywhere Ruleset

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 53a15a945d0a69eeb69f6212c488756df4eb3588 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 04:15:56 2014 +0000 Update translations for https_everywhere --- km/https-everywhere.dtd | 2 +- km/https-everywhere.properties | 6 +++--- km/ssl-observatory.dtd | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index ee51d78..4123070 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -42,6 +42,6 @@ <!ENTITY https-everywhere.popup.keep "រក្សាទុកខ្ញុំនៅលើកំណែការអភិវឌ្ឍន"> <!ENTITY https-everywhere.popup.revert "ទាញយកកំណែថេរថ្មីបំផុត"> -<!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> +<!ENTITY https-everywhere.ruleset-tests.status_title "ការសាកល្បង HTTPS Everywhere Ruleset"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel"> <!ENTITY https-everywhere.ruleset-tests.status_start_button "ចាប់ផ្ដើម"> diff --git a/km/https-everywhere.properties b/km/https-everywhere.properties index 3c46b88..85c930b 100644 --- a/km/https-everywhere.properties +++ b/km/https-everywhere.properties @@ -3,6 +3,6 @@ https-everywhere.menu.globalDisable = បិទ HTTPS Everywhere https-everywhere.menu.enableDisable = បើក / បិទ បន្ទាត់ https-everywhere.menu.noRules = (គ្មានបន្ទាត់សម្រាប់ទំព័រនេះទេ) https-everywhere.menu.unknownRules = (មិនស្គាល់បន្ទាត់សម្រាប់ទំព័រនេះ) -https-everywhere.toolbar.hint = HTTPS Everywhere គឺសកម្មឥឡូវនេះ។ អ្នកអាចបិទ/បើក វាលើតាមផ្នែក ដោយចុចរូបតំណាងរបារអាសយដ្ឋាន។ -https-everywhere.migration.notification0 = ដើម្បីប្រតិបត្តិការកែចាំបាច់, ធ្វើបច្ចុប្បន្នភាពការកំណត់ចំណូលចិត្ត HTTPS Everywhere rule របស់អ្នកឡើងវិញចំពោះតម្លៃលំនាំដើមរបស់វា។ -# https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.toolbar.hint = HTTPS Everywhere គឺសកម្មឥឡូវនេះ។ អ្នកអាចបិទ/បើក វាតាមផ្នែក ដោយចុចរូបតំណាងរបារអាសយដ្ឋាន។ +https-everywhere.migration.notification0 = ដើម្បីប្រតិបត្តិការការកែចាំបាច់, ធ្វើបច្ចុប្បន្នភាពការកំណត់ចំណូលចិត្ត HTTPS Everywhere rule របស់អ្នកឡើងវិញចំពោះតម្លៃលំនាំដើមរបស់វា។ +https-everywhere.menu.ruleset-tests = ដំណើរការការសាកល្បង HTTPS Everywhere Ruleset diff --git a/km/ssl-observatory.dtd b/km/ssl-observatory.dtd index 2084961..a0a2a2c 100644 --- a/km/ssl-observatory.dtd +++ b/km/ssl-observatory.dtd @@ -1,11 +1,11 @@  -<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> -<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.details "ព័ត៌មានឯកជន និងព័ត៌មានលម្អិត"> +<!ENTITY ssl-observatory.popup.later "សួរខ្ញុំពេលក្រោយ"> <!ENTITY ssl-observatory.popup.no "ទេ"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks -against your browser by sending the certificates you receive to the -Observatory. Turn this on?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere អាចរកឃើញការវាយប្រហារ +ប្រឆាំងកម្មវិធីអ៊ីនធឺណិតរបស់អ្នកដោយផ្ញើវិញ្ញាបនបត្រដែលអ្នកបានទទួលនៅ +កន្លែងតាមដាន។ បើកវាឬ?"> <!--<!ENTITY ssl-observatory.popup.text "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting

1 0

[arm/master] Using a direct controller in the header panel
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 9ba2c0fbca690fbfeae08546958f7aa3cc975536 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 18:54:24 2014 -0800 Using a direct controller in the header panel Swapping our header panel to use stem's Controller instance where able. There's quite a few holdouts that'll either require stem or arm additions before we can drop tor_tools. --- arm/header_panel.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 09c12a8..b4c6a1d 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -28,7 +28,7 @@ import arm.starter import arm.popups import arm.controller -from util import panel, tor_tools, ui_tools +from util import panel, tor_tools, ui_tools, tor_controller # minimum width for which panel attempts to double up contents (two columns to # better use screen real estate) @@ -86,7 +86,7 @@ class HeaderPanel(panel.Panel, threading.Thread): threading.Thread.__init__(self) self.setDaemon(True) - self._is_tor_connected = tor_tools.get_conn().is_alive() + self._is_tor_connected = tor_controller().is_alive() self._last_update = -1 # time the content was last revised self._halt = False # terminates thread if true self._cond = threading.Condition() # used for pausing the thread @@ -126,7 +126,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # listens for tor reload (sighup) events - tor_tools.get_conn().add_status_listener(self.reset_listener) + tor_controller().add_status_listener(self.reset_listener) def get_height(self): """ @@ -275,7 +275,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(1, x, "Relaying Disabled", ui_tools.get_color("cyan")) x += 17 else: - status_time = tor_tools.get_conn().controller.get_latest_heartbeat() + status_time = tor_controller().get_latest_heartbeat() if status_time: status_time_label = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(status_time)) @@ -392,7 +392,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(y, x, "none", curses.A_BOLD | ui_tools.get_color("cyan")) else: y = 2 if is_wide else 4 - status_time = tor_tools.get_conn().controller.get_latest_heartbeat() + status_time = tor_controller().get_latest_heartbeat() status_time_label = time.strftime("%H:%M %m/%d/%Y", time.localtime(status_time)) self.addstr(y, 0, "Tor Disconnected", curses.A_BOLD | ui_tools.get_color("red")) self.addstr(y, 16, " (%s) - press r to reconnect" % status_time_label) @@ -547,21 +547,21 @@ class HeaderPanel(panel.Panel, threading.Thread): """ self.vals_lock.acquire() - conn = tor_tools.get_conn() + controller = tor_controller() if set_static: # version is truncated to first part, for instance: # 0.2.2.13-alpha (git-feb8c1b5f67f2c6f) -> 0.2.2.13-alpha - self.vals["tor/version"] = conn.get_info("version", "Unknown").split()[0] - self.vals["tor/versionStatus"] = conn.get_info("status/version/current", "Unknown") - self.vals["tor/nickname"] = conn.get_option("Nickname", "") - self.vals["tor/or_port"] = conn.get_option("ORPort", "0") - self.vals["tor/dir_port"] = conn.get_option("DirPort", "0") - self.vals["tor/control_port"] = conn.get_option("ControlPort", "0") - self.vals["tor/socketPath"] = conn.get_option("ControlSocket", "") - self.vals["tor/isAuthPassword"] = conn.get_option("HashedControlPassword", None) is not None - self.vals["tor/isAuthCookie"] = conn.get_option("CookieAuthentication", None) == "1" + self.vals["tor/version"] = controller.get_info("version", "Unknown").split()[0] + self.vals["tor/versionStatus"] = controller.get_info("status/version/current", "Unknown") + self.vals["tor/nickname"] = controller.get_conf("Nickname", "") + self.vals["tor/or_port"] = controller.get_conf("ORPort", "0") + self.vals["tor/dir_port"] = controller.get_conf("DirPort", "0") + self.vals["tor/control_port"] = controller.get_conf("ControlPort", "0") + self.vals["tor/socketPath"] = controller.get_conf("ControlSocket", "") + self.vals["tor/isAuthPassword"] = controller.get_conf("HashedControlPassword", None) is not None + self.vals["tor/isAuthCookie"] = controller.get_conf("CookieAuthentication", None) == "1" # orport is reported as zero if unset @@ -571,7 +571,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # overwrite address if ORListenAddress is set (and possibly or_port too) self.vals["tor/orListenAddr"] = "" - listen_addr = conn.get_option("ORListenAddress", None) + listen_addr = controller.get_conf("ORListenAddress", None) if listen_addr: if ":" in listen_addr: @@ -585,7 +585,7 @@ class HeaderPanel(panel.Panel, threading.Thread): policy_entries = [] - for exit_policy in conn.get_option("ExitPolicy", [], True): + for exit_policy in controller.get_conf("ExitPolicy", [], True): policy_entries += [policy.strip() for policy in exit_policy.split(",")] self.vals["tor/exit_policy"] = ", ".join(policy_entries) @@ -593,7 +593,7 @@ class HeaderPanel(panel.Panel, threading.Thread): # file descriptor limit for the process, if this can't be determined # then the limit is None - fd_limit, fd_is_estimate = conn.get_my_file_descriptor_limit() + fd_limit, fd_is_estimate = tor_tools.get_conn().get_my_file_descriptor_limit() self.vals["tor/fd_limit"] = fd_limit self.vals["tor/isFdLimitEstimate"] = fd_is_estimate @@ -604,9 +604,9 @@ class HeaderPanel(panel.Panel, threading.Thread): self.vals["sys/os"] = uname_vals[0] self.vals["sys/version"] = uname_vals[2] - self.vals["tor/pid"] = conn.controller.get_pid("") + self.vals["tor/pid"] = controller.get_pid("") - start_time = conn.get_start_time() + start_time = tor_tools.get_conn().get_start_time() self.vals["tor/start_time"] = start_time if start_time else "" # reverts volatile parameters to defaults @@ -623,17 +623,17 @@ class HeaderPanel(panel.Panel, threading.Thread): # TODO: This can change, being reported by STATUS_SERVER -> EXTERNAL_ADDRESS # events. Introduce caching via tor_tools? - self.vals["tor/address"] = conn.get_info("address", "") + self.vals["tor/address"] = controller.get_info("address", "") - self.vals["tor/fingerprint"] = conn.get_info("fingerprint", self.vals["tor/fingerprint"]) - self.vals["tor/flags"] = conn.get_my_flags(self.vals["tor/flags"]) + self.vals["tor/fingerprint"] = controller.get_info("fingerprint", self.vals["tor/fingerprint"]) + self.vals["tor/flags"] = tor_tools.get_conn().get_my_flags(self.vals["tor/flags"]) # Updates file descriptor usage and logs if the usage is high. If we don't # have a known limit or it's obviously faulty (being lower than our # current usage) then omit file descriptor functionality. if self.vals["tor/fd_limit"]: - fd_used = conn.get_my_file_descriptor_usage() + fd_used = tor_tools.get_conn().get_my_file_descriptor_usage() if fd_used and fd_used <= self.vals["tor/fd_limit"]: self.vals["tor/fd_used"] = fd_used

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2014