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

[nyx/master] Menu popups stacktrace if unable to be rendered
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit bfe84b3372061bb2040dc1b7ec87777ebfb14386 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 12 15:20:10 2015 -0800 Menu popups stacktrace if unable to be rendered We returned an undefined 'selection' if the popup couldn't be made. --- nyx/popups.py | 60 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index d2d5ded..0e46ba6 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -390,43 +390,45 @@ def show_menu(title, options, old_selection): max_width = max(map(len, options)) + 9 with popup_window(len(options) + 2, max_width) as (popup, _, _): - if popup: - selection = old_selection if old_selection != -1 else 0 + if not popup: + return -1 - # hides the title of the first panel on the page + selection = old_selection if old_selection != -1 else 0 - control = nyx.controller.get_controller() - top_panel = control.get_display_panels(include_sticky = False)[0] - top_panel.set_title_visible(False) - top_panel.redraw(True) + # hides the title of the first panel on the page - curses.cbreak() # wait indefinitely for key presses (no timeout) + control = nyx.controller.get_controller() + top_panel = control.get_display_panels(include_sticky = False)[0] + top_panel.set_title_visible(False) + top_panel.redraw(True) - while True: - popup.win.erase() - popup.win.box() - popup.addstr(0, 0, title, curses.A_STANDOUT) + curses.cbreak() # wait indefinitely for key presses (no timeout) - for i in range(len(options)): - label = options[i] - format = curses.A_STANDOUT if i == selection else curses.A_NORMAL - tab = '> ' if i == old_selection else ' ' - popup.addstr(i + 1, 2, tab) - popup.addstr(i + 1, 4, ' %s ' % label, format) + while True: + popup.win.erase() + popup.win.box() + popup.addstr(0, 0, title, curses.A_STANDOUT) - popup.win.refresh() + for i in range(len(options)): + label = options[i] + format = curses.A_STANDOUT if i == selection else curses.A_NORMAL + tab = '> ' if i == old_selection else ' ' + popup.addstr(i + 1, 2, tab) + popup.addstr(i + 1, 4, ' %s ' % label, format) - key = control.key_input() + popup.win.refresh() - if key.match('up'): - selection = max(0, selection - 1) - elif key.match('down'): - selection = min(len(options) - 1, selection + 1) - elif key.is_selection(): - break - elif key.match('esc'): - selection = -1 - break + key = control.key_input() + + if key.match('up'): + selection = max(0, selection - 1) + elif key.match('down'): + selection = min(len(options) - 1, selection + 1) + elif key.is_selection(): + break + elif key.match('esc'): + selection = -1 + break top_panel.set_title_visible(True) return selection

1 0

[nyx/master] Use new get_custom_conf() method
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit a4a70c0a59ca202cd3e3d24771b675a7ec76aec9 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 22 09:45:16 2015 -0800 Use new get_custom_conf() method Taking advantage of Stem's new get_custom_conf() method, replacing our version. --- nyx/config_panel.py | 4 ++-- nyx/util/tor_config.py | 50 ++---------------------------------------------- 2 files changed, 4 insertions(+), 50 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 6419965..05332dc 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -311,7 +311,7 @@ class ConfigPanel(panel.Panel): Confirmation dialog for saving tor's configuration. """ - config_lines = tor_config.get_custom_options(True) + config_lines = tor_controller().get_custom_conf([], include_values = True) with nyx.popups.popup_window(len(config_lines) + 2) as (popup, width, height): if not popup or height <= 2: @@ -339,7 +339,7 @@ class ConfigPanel(panel.Panel): popup.addstr(i + 1, 1, option, curses.A_BOLD, 'green') popup.addstr(i + 1, len(option) + 2, arg, curses.A_BOLD, 'cyan') - # draws selection options (drawn right to left) + # selection options (drawn right to left) selection_options = ('Save', 'Save As...', 'Cancel') draw_x = width - 1 diff --git a/nyx/util/tor_config.py b/nyx/util/tor_config.py index dc39395..9d2d3f5 100644 --- a/nyx/util/tor_config.py +++ b/nyx/util/tor_config.py @@ -126,52 +126,6 @@ def get_multiline_parameters(): return tuple(MULTILINE_PARAM) -def get_custom_options(include_value = False): - """ - Provides the torrc parameters that differ from their defaults. - - Arguments: - include_value - provides the current value with results if true, otherwise - this just contains the options - """ - - config_text = tor_controller().get_info('config-text', '').strip() - config_lines = config_text.split('\n') - - # removes any duplicates - - config_lines = list(set(config_lines)) - - # The "GETINFO config-text" query only provides options that differ - # from Tor's defaults with the exception of its Log and Nickname entries - # which, even if undefined, returns "Log notice stdout" as per: - # https://trac.torproject.org/projects/tor/ticket/2362 - # - # If this is from the deb then it will be "Log notice file /var/log/tor/log" - # due to special patching applied to it, as per: - # https://trac.torproject.org/projects/tor/ticket/4602 - - try: - config_lines.remove('Log notice stdout') - except ValueError: - pass - - try: - config_lines.remove('Log notice file /var/log/tor/log') - except ValueError: - pass - - try: - config_lines.remove('Nickname %s' % socket.gethostname()) - except ValueError: - pass - - if include_value: - return config_lines - else: - return [line[:line.find(' ')] for line in config_lines] - - def save_conf(destination = None, contents = None): """ Saves the configuration to the given path. If this is equivilant to @@ -192,7 +146,7 @@ def save_conf(destination = None, contents = None): is_saveconf, start_time = True, time.time() - current_config = get_custom_options(True) + current_config = tor_controller().get_custom_conf([], include_values = True) if not contents: contents = current_config @@ -285,7 +239,7 @@ def validate(contents = None): """ controller = tor_controller() - custom_options = get_custom_options() + custom_options = controller.get_custom_conf([]) issues_found, seen_options = [], [] # Strips comments and collapses multiline multi-line entries, for more

1 0

[nyx/master] Missing check to see if the circuit's path exists
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit 7fe9a0e3242b48b95dc81061f7320fa500270f24 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 5 14:51:46 2015 -0800 Missing check to see if the circuit's path exists When starting nyx with a fresh tor instance we were liable to have a stacktrace flicker due to indexing into the path of a circuit that doesn't yet have one. --- nyx/connection_panel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 5f4f68b..42ddebd 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -186,7 +186,7 @@ class ConnectionEntry(Entry): if fingerprint: for circ in controller.get_circuits([]): - if circ.path[0][0] == fingerprint and circ.status == 'BUILT': + if circ.path and circ.path[0][0] == fingerprint and circ.status == 'BUILT': # Tor builds one-hop circuits to retrieve directory information. # If longer this is likely a connection to a guard.

1 0

[nyx/master] Drop config panel lock
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit 992d531064c20809bdb1ab07b548eabc73aca3b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 11 10:14:17 2015 -0800 Drop config panel lock This is definitely a panel that doesn't need a lock. There might be some edge cases this is risky for at present but I'll be paying special attention to the concurrency issues as I rewrite it. --- nyx/config_panel.py | 190 ++++++++++++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 100 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 99d1a3d..36688a9 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -4,7 +4,6 @@ and the resulting configuration files saved. """ import curses -import threading import nyx.controller import nyx.popups @@ -168,7 +167,6 @@ class ConfigPanel(panel.Panel): self._conf_contents = [] self._conf_important_contents = [] self._scroller = ui_tools.Scroller(True) - self._vals_lock = threading.RLock() self._sort_order = CONFIG['features.config.order'] self._show_all = False # show all options, or just the 'important' ones @@ -244,59 +242,58 @@ class ConfigPanel(panel.Panel): self._conf_important_contents = sorted(self._conf_important_contents, key = lambda entry: [entry.sort_value(field) for field in self._sort_order]) def handle_key(self, key): - with self._vals_lock: - if key.is_scroll(): - page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT - 2 - is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) - - if is_changed: - self.redraw(True) - elif key.is_selection() and self._get_config_options(): - # Prompts the user to edit the selected configuration value. The - # interface is locked to prevent updates between setting the value - # and showing any errors. - - with panel.CURSES_LOCK: - selection = self.get_selection() - config_option = selection.option() - - initial_value = '' if not selection.is_set() else selection.value() - prompt_msg = '%s Value (esc to cancel): ' % config_option - new_value = nyx.popups.input_prompt(prompt_msg, initial_value) - - if new_value is not None and new_value != initial_value: - try: - if selection.value_type() == 'Boolean': - # if the value's a boolean then allow for 'true' and 'false' inputs - - if new_value.lower() == 'true': - new_value = '1' - elif new_value.lower() == 'false': - new_value = '0' - elif selection.value_type() == 'LineList': - # set_option accepts list inputs when there's multiple values - new_value = new_value.split(',') - - tor_controller().set_conf(config_option, new_value) - - # forces the label to be remade with the new value - - selection.label_cache = None - - self.redraw(True) - except Exception as exc: - nyx.popups.show_msg('%s (press any key)' % exc) - elif key.match('a'): - self._show_all = not self._show_all + if key.is_scroll(): + page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT - 2 + is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) + + if is_changed: self.redraw(True) - elif key.match('s'): - self.show_sort_dialog() - elif key.match('v'): - self.show_write_dialog() - else: - return False + elif key.is_selection() and self._get_config_options(): + # Prompts the user to edit the selected configuration value. The + # interface is locked to prevent updates between setting the value + # and showing any errors. + + with panel.CURSES_LOCK: + selection = self.get_selection() + config_option = selection.option() + + initial_value = '' if not selection.is_set() else selection.value() + prompt_msg = '%s Value (esc to cancel): ' % config_option + new_value = nyx.popups.input_prompt(prompt_msg, initial_value) + + if new_value is not None and new_value != initial_value: + try: + if selection.value_type() == 'Boolean': + # if the value's a boolean then allow for 'true' and 'false' inputs + + if new_value.lower() == 'true': + new_value = '1' + elif new_value.lower() == 'false': + new_value = '0' + elif selection.value_type() == 'LineList': + # set_option accepts list inputs when there's multiple values + new_value = new_value.split(',') + + tor_controller().set_conf(config_option, new_value) + + # forces the label to be remade with the new value + + selection.label_cache = None + + self.redraw(True) + except Exception as exc: + nyx.popups.show_msg('%s (press any key)' % exc) + elif key.match('a'): + self._show_all = not self._show_all + self.redraw(True) + elif key.match('s'): + self.show_sort_dialog() + elif key.match('v'): + self.show_write_dialog() + else: + return False - return True + return True def show_write_dialog(self): """ @@ -442,66 +439,61 @@ class ConfigPanel(panel.Panel): ] def draw(self, width, height): - with self._vals_lock: - # panel with details for the current selection + # Shrink detail panel if there isn't sufficient room for the whole + # thing. The extra line is for the bottom border. - is_scrollbar_visible = False + scroll_location = self._scroller.get_scroll_location(self._get_config_options(), height - DETAILS_HEIGHT - 2) + cursor_selection = self.get_selection() + is_scrollbar_visible = len(self._get_config_options()) > height - DETAILS_HEIGHT - 2 - # Shrink detail panel if there isn't sufficient room for the whole - # thing. The extra line is for the bottom border. + if cursor_selection is not None: + self._draw_selection_panel(cursor_selection, width, DETAILS_HEIGHT + 1, is_scrollbar_visible) - scroll_location = self._scroller.get_scroll_location(self._get_config_options(), height - DETAILS_HEIGHT - 2) - cursor_selection = self.get_selection() - is_scrollbar_visible = len(self._get_config_options()) > height - DETAILS_HEIGHT - 2 + # draws the top label - if cursor_selection is not None: - self._draw_selection_panel(cursor_selection, width, DETAILS_HEIGHT + 1, is_scrollbar_visible) + if self.is_title_visible(): + hidden_msg = "press 'a' to hide most options" if self._show_all else "press 'a' to show all options" + title_label = 'Tor Configuration (%s):' % hidden_msg + self.addstr(0, 0, title_label, curses.A_STANDOUT) - # draws the top label + # draws left-hand scroll bar if content's longer than the height - if self.is_title_visible(): - hidden_msg = "press 'a' to hide most options" if self._show_all else "press 'a' to show all options" - title_label = 'Tor Configuration (%s):' % hidden_msg - self.addstr(0, 0, title_label, curses.A_STANDOUT) + scroll_offset = 1 - # draws left-hand scroll bar if content's longer than the height - - scroll_offset = 1 - - if is_scrollbar_visible: - scroll_offset = 3 - self.add_scroll_bar(scroll_location, scroll_location + height - DETAILS_HEIGHT - 2, len(self._get_config_options()), DETAILS_HEIGHT + 2) + if is_scrollbar_visible: + scroll_offset = 3 + self.add_scroll_bar(scroll_location, scroll_location + height - DETAILS_HEIGHT - 2, len(self._get_config_options()), DETAILS_HEIGHT + 2) - value_width = VALUE_WIDTH - description_width = max(0, width - scroll_offset - OPTION_WIDTH - value_width - 2) + value_width = VALUE_WIDTH + description_width = max(0, width - scroll_offset - OPTION_WIDTH - value_width - 2) - # if the description column is overly long then use its space for the - # value instead + # if the description column is overly long then use its space for the + # value instead - if description_width > 80: - value_width += description_width - 80 - description_width = 80 + if description_width > 80: + value_width += description_width - 80 + description_width = 80 - for line_number in range(scroll_location, len(self._get_config_options())): - entry = self._get_config_options()[line_number] - draw_line = line_number + DETAILS_HEIGHT + 2 - scroll_location + for line_number in range(scroll_location, len(self._get_config_options())): + entry = self._get_config_options()[line_number] + draw_line = line_number + DETAILS_HEIGHT + 2 - scroll_location - line_format = [curses.A_BOLD if entry.is_set() else curses.A_NORMAL] - line_format += [CONFIG['attr.config.category_color'].get(entry.category(), 'white')] + line_format = [curses.A_BOLD if entry.is_set() else curses.A_NORMAL] + line_format += [CONFIG['attr.config.category_color'].get(entry.category(), 'white')] - if entry == cursor_selection: - line_format += [curses.A_STANDOUT] + if entry == cursor_selection: + line_format += [curses.A_STANDOUT] - option_label = str_tools.crop(entry.option(), OPTION_WIDTH) - value_label = str_tools.crop(entry.value(), value_width) - summary_label = str_tools.crop(entry.summary(), description_width, None) - line_text_layout = '%%-%is %%-%is %%-%is' % (OPTION_WIDTH, value_width, description_width) - line_text = line_text_layout % (option_label, value_label, summary_label) + option_label = str_tools.crop(entry.option(), OPTION_WIDTH) + value_label = str_tools.crop(entry.value(), value_width) + summary_label = str_tools.crop(entry.summary(), description_width, None) + line_text_layout = '%%-%is %%-%is %%-%is' % (OPTION_WIDTH, value_width, description_width) + line_text = line_text_layout % (option_label, value_label, summary_label) - self.addstr(draw_line, scroll_offset, line_text, *line_format) + self.addstr(draw_line, scroll_offset, line_text, *line_format) - if draw_line >= height: - break + if draw_line >= height: + break def _get_config_options(self): return self._conf_contents if self._show_all else self._conf_important_contents @@ -548,10 +540,8 @@ class ConfigPanel(panel.Panel): description_content = 'Description: %s' % (selection.manual_entry().description if selection.manual_entry() else '') for i in range(description_height): - # checks if we're done writing the description - if not description_content: - break + break # done writing the description # there's a leading indent after the first line

1 0

[nyx/master] Simplify show_write_dialog()
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit d7fd858986c4ec2f48a389c6d74a744b3ef4e0e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 14 09:51:13 2015 -0800 Simplify show_write_dialog() Revising one of our draw funcitons, simplifying it. --- nyx/config_panel.py | 83 +++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 62 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index cc23e4e..6419965 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -308,97 +308,56 @@ class ConfigPanel(panel.Panel): def show_write_dialog(self): """ - Provies an interface to confirm if the configuration is saved and, if so, - where. + Confirmation dialog for saving tor's configuration. """ - # display a popup for saving the current configuration - config_lines = tor_config.get_custom_options(True) with nyx.popups.popup_window(len(config_lines) + 2) as (popup, width, height): - if not popup: + if not popup or height <= 2: return - # displayed options (truncating the labels if there's limited room) - - if width >= 30: - selection_options = ('Save', 'Save As...', 'Cancel') - else: - selection_options = ('Save', 'Save As', 'X') - - # checks if we can show options beside the last line of visible content + # Try showing options beside the last config line. If there isn't room + # and we can grow vertically then do that so it's on their own line. - is_option_line_separate = False - last_index = min(height - 2, len(config_lines) - 1) - - # if we don't have room to display the selection options and room to - # grow then display the selection options on its own line - - if width < (30 + len(config_lines[last_index])): + if width < (len(config_lines[height - 3]) + 30): popup.set_height(height + 1) popup.redraw(True) # recreates the window instance - new_height, _ = popup.get_preferred_size() - - if new_height > height: - height = new_height - is_option_line_separate = True + height = popup.get_preferred_size()[0] selection = 2 while True: - # if the popup has been resized then recreate it (needed for the - # proper border height) - - new_height, new_width = popup.get_preferred_size() - - if (height, width) != (new_height, new_width): - height, width = new_height, new_width - popup.redraw(True) - - # if there isn't room to display the popup then cancel it - - if height <= 2: - selection = 2 - break - + height, width = popup.get_preferred_size() # allow us to be resized popup.win.erase() - popup.win.box() popup.addstr(0, 0, 'Configuration being saved:', curses.A_STANDOUT) - visible_config_lines = height - 3 if is_option_line_separate else height - 2 + for i, full_line in enumerate(config_lines): + line = str_tools.crop(full_line, width - 2) + option, arg = line.split(' ', 1) if ' ' in line else (line, '') - for i in range(visible_config_lines): - line = str_tools.crop(config_lines[i], width - 2) - - if ' ' in line: - option, arg = line.split(' ', 1) - popup.addstr(i + 1, 1, option, curses.A_BOLD, 'green') - popup.addstr(i + 1, len(option) + 2, arg, curses.A_BOLD, 'cyan') - else: - popup.addstr(i + 1, 1, line, curses.A_BOLD, 'green') + popup.addstr(i + 1, 1, option, curses.A_BOLD, 'green') + popup.addstr(i + 1, len(option) + 2, arg, curses.A_BOLD, 'cyan') # draws selection options (drawn right to left) + selection_options = ('Save', 'Save As...', 'Cancel') draw_x = width - 1 - for i in range(len(selection_options) - 1, -1, -1): - option_label = selection_options[i] - draw_x -= (len(option_label) + 2) - - # if we've run out of room then drop the option (this will only - # occure on tiny displays) + for option in reversed(selection_options): + draw_x -= len(option) + 2 if draw_x < 1: - break + break # not enough room to show all options - selection_format = curses.A_STANDOUT if i == selection else curses.A_NORMAL + option_format = curses.A_STANDOUT if option == selection_options[selection] else curses.A_NORMAL x = popup.addstr(height - 2, draw_x, '[') - x = popup.addstr(height - 2, x, option_label, selection_format, curses.A_BOLD) + x = popup.addstr(height - 2, x, option, option_format, curses.A_BOLD) popup.addstr(height - 2, x, ']') - draw_x -= 1 # space gap between the options + draw_x -= 1 # gap between options + popup.win.box() popup.win.refresh() key = nyx.controller.get_controller().key_input() @@ -537,7 +496,7 @@ class ConfigPanel(panel.Panel): 'usage: %s' % (selection.manual_entry().usage if selection.manual_entry() else '') ]) - value_label_width = width - 12 - len(value_attr_label) + value_label_width = max(0, width - 12 - len(value_attr_label)) value_label = str_tools.crop(selection.value(), value_label_width) self.addstr(2, 2, 'Value: %s (%s)' % (value_label, value_attr_label), *selection_format)

1 0

[nyx/master] Popup for writing torrc caused stacktrace
by atagar＠torproject.org 04 Jan '16

04 Jan '16

commit 395c7aaf9ae8431bfda5f2846380f4d560aa1131 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 8 09:19:01 2015 -0800 Popup for writing torrc caused stacktrace The popup wasn't updated to use the new method of nyx.popup... Traceback (most recent call last): File "./run_nyx", line 8, in <module> nyx.main() File "/home/atagar/Desktop/nyx/nyx/__init__.py", line 31, in main nyx.starter.main() File "/home/atagar/Desktop/nyx/stem/util/conf.py", line 289, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/nyx/nyx/starter.py", line 89, in main curses.wrapper(nyx.controller.start_nyx) File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper return func(stdscr, *args, **kwds) File "/home/atagar/Desktop/nyx/nyx/controller.py", line 624, in start_nyx is_keystroke_consumed = panel_impl.handle_key(key) File "/home/atagar/Desktop/nyx/nyx/config_panel.py", line 303, in handle_key self.show_write_dialog() File "/home/atagar/Desktop/nyx/nyx/config_panel.py", line 318, in show_write_dialog popup, width, height = nyx.popups.init(len(config_lines) + 2) AttributeError: 'module' object has no attribute 'init' --- nyx/config_panel.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nyx/config_panel.py b/nyx/config_panel.py index 1a3a836..cc23e4e 100644 --- a/nyx/config_panel.py +++ b/nyx/config_panel.py @@ -315,12 +315,11 @@ class ConfigPanel(panel.Panel): # display a popup for saving the current configuration config_lines = tor_config.get_custom_options(True) - popup, width, height = nyx.popups.init(len(config_lines) + 2) - if not popup: - return + with nyx.popups.popup_window(len(config_lines) + 2) as (popup, width, height): + if not popup: + return - try: # displayed options (truncating the labels if there's limited room) if width >= 30: @@ -434,8 +433,6 @@ class ConfigPanel(panel.Panel): msg = 'Unable to save configuration (%s)' % exc.strerror nyx.popups.show_msg(msg, 2) - finally: - nyx.popups.finalize() def get_help(self): return [

1 0

[webwml/master] Explicit mention of exclude=tor for fedora.repo
by hiviah＠torproject.org 04 Jan '16

04 Jan '16

commit 941f289c899e46f314bf06025c74d57773f36093 Author: Ondrej Mikle <hiviah(a)torproject.org> Date: Mon Jan 4 10:29:32 2016 +0100 Explicit mention of exclude=tor for fedora.repo --- docs/en/rpms.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index 45f138e..158f9fa 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -67,7 +67,8 @@ repo_gpgcheck=1 <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>. - For Fedora, you usually need that exclude in fedora-updates.repo file. + For Fedora, you usually need that exclude in fedora.repo and + fedora-updates.repo file. </p> <h3>Package installation and running</h3>

1 0

[webwml/master] Explicit mention of exclude=tor for fedora-updates
by hiviah＠torproject.org 04 Jan '16

04 Jan '16

commit 5dcccb988c092960cce7ae47d51207680dfb6bef Author: Ondrej Mikle <hiviah(a)torproject.org> Date: Mon Jan 4 10:27:05 2016 +0100 Explicit mention of exclude=tor for fedora-updates --- docs/en/rpms.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index bb0d233..45f138e 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -67,6 +67,7 @@ repo_gpgcheck=1 <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>. + For Fedora, you usually need that exclude in fedora-updates.repo file. </p> <h3>Package installation and running</h3>

1 0

[orbot/master] update for Orfox
by n8fr8＠torproject.org 04 Jan '16

04 Jan '16

commit 51205b8222de4fc67806fb67b811f8db2fe7eb87 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Dec 16 10:01:24 2015 -0500 update for Orfox --- src/org/torproject/android/ui/PromoAppsActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/ui/PromoAppsActivity.java b/src/org/torproject/android/ui/PromoAppsActivity.java index 5d120d3..e51885c 100644 --- a/src/org/torproject/android/ui/PromoAppsActivity.java +++ b/src/org/torproject/android/ui/PromoAppsActivity.java @@ -16,6 +16,8 @@ import android.widget.Button; import org.torproject.android.OrbotConstants; import org.torproject.android.R; +import org.torproject.android.service.TorServiceConstants; + import java.util.List; public class PromoAppsActivity extends Activity implements OrbotConstants { @@ -79,7 +81,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { @Override public void onClick(View view) { finish(); - startActivity(getInstallIntent("info.guardianproject.browser")); + startActivity(getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME)); } });

1 0

[orbot/master] update binaries
by n8fr8＠torproject.org 04 Jan '16

04 Jan '16

commit 6fb4f0c3375d0f0d9ad7aca09baf5375fd14fe17 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Dec 16 10:00:28 2015 -0500 update binaries --- libs/armeabi-v7a/libtun2socks.so | Bin 117192 -> 117192 bytes libs/armeabi/libtun2socks.so | Bin 125376 -> 125376 bytes libs/jtorctl.jar.asc | 17 +++++++++++++++++ libs/x86/libtun2socks.so | Bin 0 -> 186728 bytes 4 files changed, 17 insertions(+) diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so index af0f3e1..4daeaed 100755 Binary files a/libs/armeabi-v7a/libtun2socks.so and b/libs/armeabi-v7a/libtun2socks.so differ diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so index dfa59ee..21b3aeb 100755 Binary files a/libs/armeabi/libtun2socks.so and b/libs/armeabi/libtun2socks.so differ diff --git a/libs/jtorctl.jar.asc b/libs/jtorctl.jar.asc new file mode 100644 index 0000000..5389dd6 --- /dev/null +++ b/libs/jtorctl.jar.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJV8yWOAAoJEKgBGD5ps3qp3OoQAKyItgPtVtJpMf5N5kyhio/E +vturIcEDGt7IZd+Ra8VpAqvxlkaI9Er37jzoUlyhyt6nfehu2QVf2UKrUTPPC7hS +W2vmQi18R69zzF+quKJM/6pcODJSoaKEGLsA5ccsAWvCpywy0joGE13JtWvlqMlu +t4RkbZgz3Rb9+uthil+7g+K3I9d9FJiK+cgbLJAiWC+/0q/B+aZZYvOhekE7M4y3 +RpYuuSDIVnU+Whcg5X/LGuMqxreIA0rQKx2qqiTfZ3YFLM9tt98krakTl/NBkpqT +gvTUCYSgy8vdNUdiCM+jpXeE7DEKfysfdiRxSK7IV4FXqnPMwKS7PGMOFhec+PvG +832JYC+yqj62FJFoxkM0VWjUXQOXCL5TyTDM1ZPaIlfQzzuvU5znhOadLDkb+9NZ +oBdghMmckeVQwL9ZY+V1PJdojfDoXJN1Ql+Q3Giki1fKChkwv0pngEXaq0q1fhvU +OnWU6A8y9u8dP0doQ1rzVQwV3lk9TQFqmY7vdKlviYSVsRS0Wp/CvLXuBCR4GEvK +U5cMwwVTVJafMGzJYyemrdzBTqi3zygM2HCdClKTBHc5SVu09w4CzCgOIOFfMwGp +rUknbMmGkDlw5ujucRKcoCf1xaHfWG5eL8KikJLIsRPnIgkKi/ty2BIu5U6PLCQc ++pZ9ZrpUx60BTzBhexTM +=inkD +-----END PGP SIGNATURE----- diff --git a/libs/x86/libtun2socks.so b/libs/x86/libtun2socks.so new file mode 100755 index 0000000..a6499cb Binary files /dev/null and b/libs/x86/libtun2socks.so differ

1 0