March 2016 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'dgoulet/bug18623_028_01'
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit d5f50cb052a535b5193dc14ccfd3239a722943c2 Merge: 4f86d75 ba6509e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 24 15:03:50 2016 -0400 Merge remote-tracking branch 'dgoulet/bug18623_028_01' src/or/directory.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 3d0e476cbc299f1fabc1c2e432c80e89399db3ef Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 17:46:05 2016 +0000 Update translations for tails-perl5lib_completed --- sq.po | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sq.po b/sq.po index 1c725cd..c2c836f 100644 --- a/sq.po +++ b/sq.po @@ -3,23 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bujar Tafili, 2015 +# Bujar Tafili, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-06-24 11:37+0200\n" -"PO-Revision-Date: 2015-02-22 23:00+0000\n" +"POT-Creation-Date: 2016-01-25 16:59+0100\n" +"PO-Revision-Date: 2016-03-24 17:17+0000\n" "Last-Translator: Bujar Tafili\n" -"Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n" +"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/RunningSystem.pm:153 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Gabim" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" msgstr "Pajisja Tails po ekzekutohet prej nga s'mund ta gjejmë. Mos ndoshta përdorët opsionin `toram'?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Njësia Tails po ekzekutohet nga ku s'është e mundur të gjendet. Ndoshta përdorët opsionin `toram'?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit f77349616535684dc49995f662fc5c2f2d13b22e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 17:46:00 2016 +0000 Update translations for tails-perl5lib --- sq.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sq.po b/sq.po index 7baf79b..c2c836f 100644 --- a/sq.po +++ b/sq.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bujar Tafili, 2015 +# Bujar Tafili, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-25 16:59+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-03-24 17:17+0000\n" +"Last-Translator: Bujar Tafili\n" "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,4 +32,4 @@ msgstr "Pajisja Tails po ekzekutohet prej nga s'mund ta gjejmë. Mos ndoshta pë msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "Njësia Tails po ekzekutohet nga ku s'është e mundur të gjendet. Ndoshta përdorët opsionin `toram'?"

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 7e288b3a946ed80d0e371a3c5c1d1c6ba95f7d39 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 17:16:38 2016 +0000 Update translations for tor-messenger-ircproperties --- sq/irc.properties | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/sq/irc.properties b/sq/irc.properties index c596c8a..8362475 100644 --- a/sq/irc.properties +++ b/sq/irc.properties @@ -55,7 +55,7 @@ command.devoice=%S <nick1>[,<nick2>]*: Hiqeni statusin e kanalit të command.invite2=%S <nick>[ <nick>]* [<channel>]: Ftoni një ose më shumë pseudonime që t'ju bashkëngjiten në këtë kanal, ose për të hyrë në kanalin e veçantë. command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Hyni në një ose më shumë kanale, duke futur sipas rastit një çelës kanali nëse nevojitet. command.kick=%S <nick> [<message>]: Hiqni ndokënd nga një kanal. Që ta bëni këtë duhet të jeni një operator kanali. -command.list=%S: Shfaqni një listë me grupe biseduesish në rrjet. Kujdes, disa shërbyes mund t'ju shkëpusin kur ta bëni këtë. +command.list=%S: Shfaqni një listë me seksione biseduesish në rrjet. Kujdes, disa shërbyes mund t'ju shkëpusin kur ta bëni këtë. command.memoserv=%S <command>: Dërgoni një komandë tek MemoServ. command.modeUser=%S (+|-)<new mode> [<nick>]: Vendosni ose hiqni modalitetin e një përdoruesi. command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Merrni, vendosni ose hiqni një modalitet kanali. @@ -71,54 +71,54 @@ command.quit=%S <message> Shkëputuni nga shërbyesi, me një mesazh jo de command.quote=%S <command>: Dërgoni një komandë paraprake tek shërbyesi. command.time=%S: shfaq kohën lokale tek shërbyesi IRC. command.topic=%S [<new topic>]: Përcaktoni tematikën e këtij kanali. -command.umode=%S (+|-)<new mode>: Set or unset a user mode. -command.version=%S <nick>: Request the version of a user's client. -command.voice=%S <nick1>[,<nick2>]*: Grant channel voice status to someone. You must be a channel operator to do this. -command.whois2=%S [<nick>]: Get information on a user. +command.umode=%S (+|-)<new mode>: Vendosni ose hiqni modalitetin e një përdoruesi. +command.version=%S <nick>: Kërkoni versionin e një klienti të përdoruesit. +command.voice=%S <nick1>[,<nick2>]*: Jepini ndokujt statusin e kanalit të zëërit. Që ta bëni këtë duhet të jeni një operator kanali. +command.whois2=%S [<nick>]: Merrni informacion mbi një përdorues. # LOCALIZATION NOTE (message.*): # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. -message.join=%1$S [%2$S] entered the room. +message.join=%1$S [%2$S] hyri në seksion. message.rejoined=Ju i jeni ribashkuar seksionit. # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. -message.kicked.you=You have been kicked by %1$S%2$S. +message.kicked.you=Ju jeni përzënë nga %1$S%2$S. # %1$S is the nick that is kicked, %2$S the nick of the person who kicked # %1$S. %3$S is message.kicked.reason, if a kick message was given. -message.kicked=%1$S has been kicked by %2$S%3$S. +message.kicked=%1$S është përzënë nga %2$S%3$S. # %S is the kick message message.kicked.reason=: %S # %1$S is the new mode, %2$S is the nickname of the user whose mode # was changed, and %3$S is who set the mode. -message.usermode=Mode %1$S for %2$S set by %3$S. +message.usermode=Modaliteti %1$S për %2$S i vendosur nga %3$S. # %1$S is the new channel mode and %2$S is who set the mode. -message.channelmode=Channel mode %1$S set by %2$S. +message.channelmode=Modaliteti %1$S i vendosur nga %2$S. # %S is the user's mode. -message.yourmode=Your mode is %S. +message.yourmode=Modaliteti juaj është %S. # Could not change the nickname. %S is the user's nick. -message.nick.fail=Could not use the desired nickname. Your nick remains %S. +message.nick.fail=S'mund ta përdorni pseudonimin e dëshiruar. Pseudonimi juaj mbetet %S. # The parameter is the message.parted.reason, if a part message is given. -message.parted.you=You have left the room (Part%1$S). +message.parted.you=Jeni larguar nga seksioni (Part%1$S). # %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. -message.parted=%1$S has left the room (Part%2$S). +message.parted=%1$S është larguar nga seksioni (Part%2$S). # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. -message.quit=%1$S has left the room (Quit%2$S). +message.quit=%1$S është larguar nga seksioni (Quit%2$S). # The parameter is the quit message given by the user. message.quit2=: %S # %1$S is the nickname of the user that invited us, %2$S is the conversation # name. -message.inviteReceived=%1$S has invited you to %2$S. +message.inviteReceived=%1$S ju ka ftuar tek %2$S. # %1$S is the nickname of the invited user, %2$S is the conversation name # they were invited to. -message.invited=%1$S was successfully invited to %2$S. +message.invited=%1$S u ftua me sukses tek %2$S. # %1$S is the nickname of the invited user, %2$S is the conversation name # they were invited to but are already in -message.alreadyInChannel=%1$S is already in %2$S. +message.alreadyInChannel=%1$S është tashmë në %2$S. # %S is the nickname of the user who was summoned. -message.summoned=%S was summoned. +message.summoned=%S është thirrur. # %S is the nickname of the user whose WHOIS information follows this message. message.whois=WHOIS information for %S: # %1$S is the nickname of the (offline) user whose WHOWAS information follows this message. @@ -146,7 +146,7 @@ message.ping=Ping reply from %1$S in #2 millisecond.;Ping reply from %1$S in #2 # LOCALIZATION NOTE (error.*): # These are shown as error messages in the conversation or server tab. # %S is the channel name. -error.noChannel=There is no channel: %S. +error.noChannel=S'ka kanal: %S. error.tooManyChannels=Cannot join %S; you've joined too many channels. # %1$S is your new nick, %2$S is the kill message from the server. error.nickCollision=Nick already in use, changing nick to %1$S [%2$S]. @@ -155,9 +155,9 @@ error.banned=You are banned from this server. error.bannedSoon=You will soon be banned from this server. error.mode.wrongUser=You cannot change modes for other users. # %S is the nickname or channel name that isn't available. -error.noSuchNick=%S is not online. +error.noSuchNick=%S s'është në linjë. error.wasNoSuchNick=There was no nickname: %S -error.noSuchChannel=There is no channel: %S. +error.noSuchChannel=S'ka kanal: %S. error.unavailable=%S is temporarily unavailable. # %S is the channel name. error.channelBanned=You have been banned from %S.

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 69bdafa18aca4ea4d33c36906bab15f348b15c1b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 17:15:42 2016 +0000 Update translations for tor-launcher-progress_completed --- sq/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/progress.dtd b/sq/progress.dtd index 8138a00..f680a4c 100644 --- a/sq/progress.dtd +++ b/sq/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Gjendja e Tor"> <!ENTITY torprogress.openSettings "Hapeni Konfigurimin"> <!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendoset një lidhje me rrjetin Tor"> +<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 347b26ca03717775f4f551c5dbed19b49a5603f9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 17:15:37 2016 +0000 Update translations for tor-launcher-progress --- sq/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/progress.dtd b/sq/progress.dtd index 167ecd2..f680a4c 100644 --- a/sq/progress.dtd +++ b/sq/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Gjendja e Tor"> <!ENTITY torprogress.openSettings "Hapeni Konfigurimin"> <!ENTITY torprogress.heading "Duke u lidhur me rrjetin Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Ju lutemi prisni derisa të vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta.">

1 0

[nyx/master] Rewrite show_help_popup()
by atagar＠torproject.org 24 Mar '16

24 Mar '16

commit 40534bda29f6f7e090550b0a44e4a3af91fbc61a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 24 09:52:15 2016 -0700 Rewrite show_help_popup() Bit of an experiment in splitting our Panel class from its responsibilities as a curses subwindow. With this new pattern our draw function gets a subwindow argument it can draw into. It only has draw functions (and the curses lock) within that context. Thus far results are promissing but don't be surprised if this changes again. :P --- nyx/curses.py | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ nyx/popups.py | 87 ++++++++++++++++++------------------------ 2 files changed, 157 insertions(+), 50 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 3e88994..67305c6 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -20,6 +20,12 @@ if we want Windows support in the future too. disable_acs - renders replacements for ACS characters is_wide_characters_supported - checks if curses supports wide character + draw - renders subwindow that can be drawn into + + Subwindow - subwindow that can be drawn within + |- addstr - draws a string + +- box - draws box with the given dimensions + KeyInput - user keyboard input |- match - checks if this matches the given inputs |- is_scroll - true if key is used for scrolling @@ -370,6 +376,120 @@ def is_wide_characters_supported(): return False +def draw(func, left = 0, top = 0, width = None, height = None): + """ + Renders subwindow using the given draw function. + + :param function func: draw function for rendering the subwindow + :param int left: left position of the panel + :param int top: top position of the panel + :param int width: panel width, uses all available space if **None** + :param int height: panel height, uses all available space if **None** + """ + + with CURSES_LOCK: + max_height, max_width = CURSES_SCREEN.getmaxyx() + + subwindow_width = max(0, max_width - left) + subwindow_height = max(0, max_height - top) + + if width: + subwindow_width = min(width, subwindow_width) + + if height: + subwindow_height = min(height, subwindow_height) + + curses_subwindow = CURSES_SCREEN.subwin(subwindow_height, subwindow_width, top, left) + curses_subwindow.erase() + func(Subwindow(subwindow_width, subwindow_height, curses_subwindow)) + curses_subwindow.refresh() + + +class Subwindow(object): + """ + Subwindow that can be drawn within. + + :var int width: subwindow width + :var int height: subwindow height + """ + + def __init__(self, width, height, curses_subwindow): + self.width = width + self.height = height + self._curses_subwindow = curses_subwindow + + def addstr(self, x, y, msg, *attr): + """ + Draws a string in the subwindow. + + :param int x: horizontal location + :param int y, vertical location + :param str msg: string to be written + :param list attr: text attributes to apply + """ + + if self.width > x and self.height > y: + try: + cropped_msg = msg[:self.width - x] + self._curses_subwindow.addstr(y, x, cropped_msg, curses_attr(*attr)) + return x + len(cropped_msg) + except: + pass + + return x + + def box(self, left = 0, top = 0, width = None, height = None, *attr): + """ + Draws a box with the given bounds. + + :param int left: left position of the box + :param int top: top position of the box + :param int width: box width, uses all available space if **None** + :param int height: box height, uses all available space if **None** + :param list attr: text attributes to apply + """ + + max_width = self.width - left + max_height = self.height - top + + width = max_width if width is None else min(width, max_width) + height = max_height if height is None else min(height, max_height) + + self._hline(left + 1, top, width - 2, *attr) # top + self._hline(left + 1, top + height - 1, width - 2, *attr) # bottom + self._vline(left, top + 1, height - 2, *attr) # left + self._vline(left + width - 1, top + 1, height - 2, *attr) # right + + self._addch(left, top, curses.ACS_ULCORNER, *attr) # upper left corner + self._addch(left, top + height - 1, curses.ACS_LLCORNER, *attr) # lower left corner + self._addch(left + width - 1, top, curses.ACS_URCORNER, *attr) # upper right corner + self._addch(left + width - 1, top + height - 1, curses.ACS_LRCORNER, *attr) # lower right corner + + def _addch(self, x, y, char, *attr): + if self.width > x and self.height > y: + try: + self._curses_subwindow.addch(y, x, char, curses_attr(*attr)) + return x + 1 + except: + pass + + return x + + def _hline(self, x, y, length, *attr): + if self.width > x and self.height > y: + try: + self._curses_subwindow.hline(y, x, curses.ACS_HLINE | curses_attr(*attr), min(length, self.width - x)) + except: + pass + + def _vline(self, x, y, length, *attr): + if self.width > x and self.height > y: + try: + self._curses_subwindow.vline(y, x, curses.ACS_VLINE | curses_attr(*attr), min(length, self.height - y)) + except: + pass + + class KeyInput(object): """ Keyboard input by the user. diff --git a/nyx/popups.py b/nyx/popups.py index 1f19189..25ff618 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -77,71 +77,58 @@ def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True def show_help_popup(): """ - Presents a popup with instructions for the current page's hotkeys. This - returns the user input used to close the popup. If the popup didn't close - properly, this is an arrow, enter, or scroll key then this returns None. - """ - - with popup_window(9, 80) as (popup, _, height): - if popup: - exit_key = None - control = nyx.controller.get_controller() - page_panels = control.get_display_panels() - - # the first page is the only one with multiple panels, and it looks better - # with the log entries first, so reversing the order - - page_panels.reverse() + Presents a popup with instructions for the current page's hotkeys. - help_options = [] + :returns: :class:`~nyx.curses.KeyInput` that was pressed to close the popup + if it's one panels should act upon, **None** otherwise + """ - for entry in page_panels: - help_options += entry.get_help() + control = nyx.controller.get_controller() + sticky_height = sum([sticky_panel.get_height() for sticky_panel in control.get_sticky_panels()]) + help_options = [] - # test doing afterward in case of overwriting + for panel in reversed(control.get_display_panels()): + help_options += panel.get_help() - popup.draw_box() - popup.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), HIGHLIGHT) + def _render(subwindow): + subwindow.box() + subwindow.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), HIGHLIGHT) - for i in range(len(help_options)): - if i / 2 >= height - 2: - break + for i in range(len(help_options)): + if i / 2 >= subwindow.height - 2: + break - # draws entries in the form '<key>: <description>[ (<selection>)]', for - # instance... - # u: duplicate log entries (hidden) + # Entries are shown in the form '<key>: <description>[ (<selection>)]', + # such as... + # + # u: duplicate log entries (hidden) - key, description, selection = help_options[i] + key, description, selection = help_options[i] - if key: - description = ': ' + description + x = 2 if i % 2 == 0 else 41 + y = (i / 2) + 1 - row = (i / 2) + 1 - col = 2 if i % 2 == 0 else 41 + x = subwindow.addstr(x, y, key, BOLD) + x = subwindow.addstr(x, y, ': ' + description) - popup.addstr(row, col, key, BOLD) - col += len(key) - popup.addstr(row, col, description) - col += len(description) + if selection: + x = subwindow.addstr(x, y, ' (') + x = subwindow.addstr(x, y, selection, BOLD) + x = subwindow.addstr(x, y, ')') - if selection: - popup.addstr(row, col, ' (') - popup.addstr(row, col + 2, selection, BOLD) - popup.addstr(row, col + 2 + len(selection), ')') + # tells user to press a key if the lower left is unoccupied - # tells user to press a key if the lower left is unoccupied + if len(help_options) < 13 and subwindow.height == 9: + subwindow.addstr(2, 7, 'Press any key...') - if len(help_options) < 13 and height == 9: - popup.addstr(7, 2, 'Press any key...') + with nyx.curses.CURSES_LOCK: + nyx.curses.draw(_render, top = sticky_height, width = 80, height = 9) + keypress = nyx.curses.key_input() - popup.win.refresh() - exit_key = nyx.curses.key_input() - - if not exit_key.is_selection() and not exit_key.is_scroll() and \ - not exit_key.match('left', 'right'): - return exit_key - else: + if keypress.is_selection() or keypress.is_scroll() or keypress.match('left', 'right'): return None + else: + return keypress def show_about_popup():

1 0

[nyx/master] Stacktrace when we get a NEWCONSENSUS event
by atagar＠torproject.org 24 Mar '16

24 Mar '16

commit 77a41b128940b568dc7a73bd2aabc369c6824f45 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 24 08:41:27 2016 -0700 Stacktrace when we get a NEWCONSENSUS event This largely reverts commit df0fc05, but *doesn't* add it back to the connection panel. That is to say curses still works but the connection panel doesn't. Doing this since df0fc05 was deceptively broken (task() was never called since we weren't a Daemon subclass) *and* getting a NEWCONSENSUS event caused stacktraces... Traceback (most recent call last): File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner self.run() File "/usr/lib/python2.7/threading.py", line 504, in run self.__target(*self.__args, **self.__kwargs) File "/home/atagar/Desktop/nyx/stem/control.py", line 921, in _event_loop self._handle_event(event_message) File "/home/atagar/Desktop/nyx/stem/control.py", line 3624, in _handle_event listener(event_message) File "/home/atagar/Desktop/nyx/nyx/tracker.py", line 815, in _new_consensus_event self.update(event.desc) AttributeError: 'ConsensusTracker' object has no attribute 'update' --- nyx/panel/connection.py | 9 +++++++++ nyx/tracker.py | 28 +++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 952148f..22cda50 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -404,6 +404,15 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): self._update() self.redraw(True) + + # TODO: The following is needed to show results *but* causes curses to + # flicker. For our plans on this see... + # + # https://trac.torproject.org/projects/tor/ticket/18547#comment:1 + + # if last_ran == -1: + # nyx.tracker.get_consensus_tracker().update(tor_controller().get_network_statuses([])) + last_ran = time.time() def get_help(self): diff --git a/nyx/tracker.py b/nyx/tracker.py index 662f965..a772ff9 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -29,6 +29,7 @@ Background tasks for gathering information about the tor process. +- stop - stops further work by the daemon ConsensusTracker - performant lookups for consensus related information + |- update - updates the consensus information we're based on |- get_relay_nickname - provides the nickname for a given relay |- get_relay_fingerprints - provides relays running at a location +- get_relay_address - provides the address a relay is running at @@ -814,24 +815,25 @@ class ConsensusTracker(object): def _new_consensus_event(self, event): self.update(event.desc) - def _task(self, process_pid, process_name): + def update(self, router_status_entries): """ - If this is our first run then populate our cache. + Updates our cache with the given router status entries. + + :param list router_status_entries: router status entries to populate our cache with """ - if not self._fingerprint_cache: - new_fingerprint_cache = {} - new_address_cache = {} - new_nickname_cache = {} + new_fingerprint_cache = {} + new_address_cache = {} + new_nickname_cache = {} - for desc in tor_controller().get_network_statuses([]): - new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) - new_nickname_cache[desc.fingerprint] = desc.nickname if desc.nickname else 'Unnamed' + for desc in router_status_entries: + new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) + new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) + new_nickname_cache[desc.fingerprint] = desc.nickname if desc.nickname else 'Unnamed' - self._fingerprint_cache = new_fingerprint_cache - self._address_cache = new_address_cache - self._nickname_cache = new_nickname_cache + self._fingerprint_cache = new_fingerprint_cache + self._address_cache = new_address_cache + self._nickname_cache = new_nickname_cache def get_relay_nickname(self, fingerprint): """

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 39c1ae905130c398ccfef7abbe9c5c7d809b4c52 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 16:46:59 2016 +0000 Update translations for tor-messenger-ircproperties --- sq/irc.properties | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sq/irc.properties b/sq/irc.properties index a3b1157..c596c8a 100644 --- a/sq/irc.properties +++ b/sq/irc.properties @@ -50,27 +50,27 @@ ctcp.time=Koha për %1$S është %2$S. command.action=%S <action to perform>: Kryeni një veprim. command.ctcp=%S <nick> <msg>: Dërgoni një mesazh CTCP tek pseudonimi. command.chanserv=%S <command>: Dërgoni një komandë tek ChanServ. -command.deop=%S <nick1>[,<nick2>]*: Remove channel operator status from someone. You must be a channel operator to do this. -command.devoice=%S <nick1>[,<nick2>]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this. -command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or more nicks to join you in the current channel, or to join the specified channel. -command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Enter one or more channels, optionally providing a channel key for each if needed. -command.kick=%S <nick> [<message>]: Remove someone from a channel. You must be a channel operator to do this. -command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this. -command.memoserv=%S <command>: Send a command to MemoServ. -command.modeUser=%S (+|-)<new mode> [<nick>]: Set or unset a user's mode. -command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Get, set or unset a channel mode. -command.msg=%S <nick> <message>: Send a private message to a user (as opposed to a channel). +command.deop=%S <nick1>[,<nick2>]*: Hiqeni statusin e operatorit të kanalit nga ndonjëri. Që ta bëni këtë duhet të jeni një operator kanali. +command.devoice=%S <nick1>[,<nick2>]*: Hiqeni statusin e kanalit të zërit nga ndonjëri, që ta pengoni të flasë nëse kanali është moderuar e parandaluar (+m). Që ta bëni këtë duhet të jeni një operator kanali. +command.invite2=%S <nick>[ <nick>]* [<channel>]: Ftoni një ose më shumë pseudonime që t'ju bashkëngjiten në këtë kanal, ose për të hyrë në kanalin e veçantë. +command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Hyni në një ose më shumë kanale, duke futur sipas rastit një çelës kanali nëse nevojitet. +command.kick=%S <nick> [<message>]: Hiqni ndokënd nga një kanal. Që ta bëni këtë duhet të jeni një operator kanali. +command.list=%S: Shfaqni një listë me grupe biseduesish në rrjet. Kujdes, disa shërbyes mund t'ju shkëpusin kur ta bëni këtë. +command.memoserv=%S <command>: Dërgoni një komandë tek MemoServ. +command.modeUser=%S (+|-)<new mode> [<nick>]: Vendosni ose hiqni modalitetin e një përdoruesi. +command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Merrni, vendosni ose hiqni një modalitet kanali. +command.msg=%S <nick> <message>: Dërgoni një mesazh privat tek një përdorues. (përkundër një kanali). command.nick=%S <new nickname>: Ndryshoni pseudonimin tuaj. -command.nickserv=%S <command>: Send a command to NickServ. -command.notice=%S <target> <message>: Send a notice to a user or channel. -command.op=%S <nick1>[,<nick2>]*: Grant channel operator status to someone. You must be a channel operator to do this. -command.operserv=%S <command>: Send a command to OperServ. -command.part=%S [message]: Leave the current channel with an optional message. -command.ping=%S [<nick>]: Asks how much lag a user (or the server if no user specified) has. -command.quit=%S <message>: Disconnect from the server, with an optional message. -command.quote=%S <command>: Send a raw command to the server. -command.time=%S: Displays the current local time at the IRC server. -command.topic=%S [<new topic>]: Set this channel's topic. +command.nickserv=%S <command>: Dërgoni një komandë tek NickServ. +command.notice=%S <target> <message>: Dërgoni një njoftim tek një përdorues ose kanal. +command.op=%S <nick1>[,<nick2>]*: Jepini ndokujt statusin e operatorit të kanalit. Që ta bëni këtë duhet të jeni një operator kanali. +command.operserv=%S <command>: Dërgoni një komandë tek OperServ. +command.part=%S [message]: Lëreni kanalin ku jeni me një mesazh jo detyrues. +command.ping=%S [<nick>]: Kërkon sesa vonohet një përdorues (ose një shërbyes, nëse nuk është specifikuar një përdorues). +command.quit=%S <message> Shkëputuni nga shërbyesi, me një mesazh jo detyrues. +command.quote=%S <command>: Dërgoni një komandë paraprake tek shërbyesi. +command.time=%S: shfaq kohën lokale tek shërbyesi IRC. +command.topic=%S [<new topic>]: Përcaktoni tematikën e këtij kanali. command.umode=%S (+|-)<new mode>: Set or unset a user mode. command.version=%S <nick>: Request the version of a user's client. command.voice=%S <nick1>[,<nick2>]*: Grant channel voice status to someone. You must be a channel operator to do this.

1 0

[tor/master] try to fix a test failure for sizeof(time_t)==4.
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit 4f86d75a4bece7768ddb87db0276268666efcf11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 24 12:26:46 2016 -0400 try to fix a test failure for sizeof(time_t)==4. --- src/test/test_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 62c6765..bcbffe1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -581,10 +581,10 @@ test_util_time(void *arg) * time_t */ format_rfc1123_time(timestr, (time_t)2150000000UL); #if SIZEOF_TIME_T == 4 - /* format_rfc1123_time should indicate failure on overflow, but it doesn't - * yet. Hopefully #18480 will improve the failure semantics in this case. - tt_str_op("Wed, 17 Feb 2038 06:13:20 GMT",OP_EQ, timestr); - */ + /* Wrapping around will have made it this. */ + tt_str_op("Sat, 11 Jan 1902 23:45:04 GMT",OP_EQ, timestr); + /* Make sure that the right date doesn't parse. */ + strlcpy(timestr, "Wed, 17 Feb 2038 06:13:20 GMT", sizeof(timestr)); t_res = 0; i = parse_rfc1123_time(timestr, &t_res);

1 0