- tor-commits - lists.torproject.org

[arm/master] Moving sort selection out of the controller
by atagar＠torproject.org 07 May '11

07 May '11

commit 77dc38f4fdd098a124b2973a86c267bdfd126f92 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 7 12:29:59 2011 -0700 Moving sort selection out of the controller Sort dialogs are now provided by the popups toolkit, and triggered by the panels that want to sort themselves. --- src/cli/configPanel.py | 25 ++++++++ src/cli/connections/connPanel.py | 10 +++ src/cli/controller.py | 125 -------------------------------------- src/cli/popups.py | 106 ++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 125 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 90c6191..6aaafc2 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -6,6 +6,8 @@ and the resulting configuration files saved. import curses import threading +import popups + from util import conf, enum, panel, torTools, torConfig, uiTools DEFAULT_CONFIG = {"features.config.selectionDetails.height": 6, @@ -43,6 +45,16 @@ FIELD_ATTR = {Field.CATEGORY: ("Category", "red"), Field.MAN_ENTRY: ("Man Page Entry", "blue"), Field.IS_DEFAULT: ("Is Default", "magenta")} +def getFieldFromLabel(fieldLabel): + """ + Converts field labels back to their enumeration, raising a ValueError if it + doesn't exist. + """ + + for entryEnum in FIELD_ATTR: + if fieldLabel == FIELD_ATTR[entryEnum][0]: + return entryEnum + class ConfigEntry(): """ Configuration option in the panel. @@ -246,6 +258,19 @@ class ConfigPanel(panel.Panel): elif key == ord('a') or key == ord('A'): self.showAll = not self.showAll self.redraw(True) + elif key == ord('s') or key == ord('S'): + # set ordering for config options + titleLabel = "Config Option Ordering:" + options = [FIELD_ATTR[field][0] for field in Field.values()] + oldSelection = [FIELD_ATTR[field][0] for field in self.sortOrdering] + optionColors = dict([FIELD_ATTR[field] for field in Field.values()]) + results = popups.showSortDialog(titleLabel, options, oldSelection, optionColors) + + if results: + # converts labels back to enums + resultEnums = [getFieldFromLabel(label) for label in results] + self.setSortOrder(resultEnums) + self.valsLock.release() def getHelp(self): diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 40c479e..8ad41d5 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -6,6 +6,8 @@ import time import curses import threading +import cli.popups + from cli.connections import entries, connEntry, circEntry from util import connections, enum, panel, torTools, uiTools @@ -149,6 +151,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): elif uiTools.isSelectionKey(key): self._showDetails = not self._showDetails self.redraw(True) + elif key == ord('s') or key == ord('S'): + # set ordering for connection options + titleLabel = "Connection Ordering:" + options = entries.SortAttr.values() + oldSelection = self._sortOrdering + optionColors = dict([(attr, entries.SORT_COLORS[attr]) for attr in options]) + results = cli.popups.showSortDialog(titleLabel, options, oldSelection, optionColors) + if results: self.setSortOrder(results) self.valsLock.release() diff --git a/src/cli/controller.py b/src/cli/controller.py index 1501419..09e3575 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -326,98 +326,6 @@ def showMenu(stdscr, popup, title, options, initialSelection): return selection -def showSortDialog(stdscr, panels, isPaused, page, titleLabel, options, oldSelection, optionColors): - """ - Displays a sorting dialog of the form: - - Current Order: <previous selection> - New Order: <selections made> - - <option 1> <option 2> <option 3> Cancel - - Options are colored when among the "Current Order" or "New Order", but not - when an option below them. If cancel is selected or the user presses escape - then this returns None. Otherwise, the new ordering is provided. - - Arguments: - stdscr, panels, isPaused, page - boiler plate arguments of the controller - (should be refactored away when rewriting) - - titleLabel - title displayed for the popup window - options - ordered listing of option labels - oldSelection - current ordering - optionColors - mappings of options to their color - - """ - - panel.CURSES_LOCK.acquire() - newSelections = [] # new ordering - - try: - setPauseState(panels, isPaused, page, True) - curses.cbreak() # wait indefinitely for key presses (no timeout) - - popup = panels["popup"] - cursorLoc = 0 # index of highlighted option - - # label for the inital ordering - formattedPrevListing = [] - for sortType in oldSelection: - colorStr = optionColors.get(sortType, "white") - formattedPrevListing.append("<%s>%s</%s>" % (colorStr, sortType, colorStr)) - prevOrderingLabel = "<b>Current Order: %s</b>" % ", ".join(formattedPrevListing) - - selectionOptions = list(options) - selectionOptions.append("Cancel") - - while len(newSelections) < len(oldSelection): - popup.clear() - popup.win.box() - popup.addstr(0, 0, titleLabel, curses.A_STANDOUT) - popup.addfstr(1, 2, prevOrderingLabel) - - # provides new ordering - formattedNewListing = [] - for sortType in newSelections: - colorStr = optionColors.get(sortType, "white") - formattedNewListing.append("<%s>%s</%s>" % (colorStr, sortType, colorStr)) - newOrderingLabel = "<b>New Order: %s</b>" % ", ".join(formattedNewListing) - popup.addfstr(2, 2, newOrderingLabel) - - # presents remaining options, each row having up to four options with - # spacing of nineteen cells - row, col = 4, 0 - for i in range(len(selectionOptions)): - popup.addstr(row, col * 19 + 2, selectionOptions[i], curses.A_STANDOUT if cursorLoc == i else curses.A_NORMAL) - col += 1 - if col == 4: row, col = row + 1, 0 - - popup.refresh() - - key = stdscr.getch() - if key == curses.KEY_LEFT: cursorLoc = max(0, cursorLoc - 1) - elif key == curses.KEY_RIGHT: cursorLoc = min(len(selectionOptions) - 1, cursorLoc + 1) - elif key == curses.KEY_UP: cursorLoc = max(0, cursorLoc - 4) - elif key == curses.KEY_DOWN: cursorLoc = min(len(selectionOptions) - 1, cursorLoc + 4) - elif uiTools.isSelectionKey(key): - # selected entry (the ord of '10' seems needed to pick up enter) - selection = selectionOptions[cursorLoc] - if selection == "Cancel": break - else: - newSelections.append(selection) - selectionOptions.remove(selection) - cursorLoc = min(cursorLoc, len(selectionOptions) - 1) - elif key == 27: break # esc - cancel - - setPauseState(panels, isPaused, page) - curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior - finally: - panel.CURSES_LOCK.release() - - if len(newSelections) == len(oldSelection): - return newSelections - else: return None - def setEventListening(selectedEvents, isBlindMode): # creates a local copy, note that a suspected python bug causes *very* # puzzling results otherwise when trying to discard entries (silently @@ -1282,18 +1190,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if selection != -1 and options[selection] != panels["conn"]._listingType: panels["conn"].setListingType(options[selection]) panels["conn"].redraw(True) - elif page == 1 and (key == ord('s') or key == ord('S')): - # set ordering for connection options - titleLabel = "Connection Ordering:" - options = cli.connections.entries.SortAttr.values() - oldSelection = panels["conn"]._sortOrdering - optionColors = dict([(attr, cli.connections.entries.SORT_COLORS[attr]) for attr in options]) - results = showSortDialog(stdscr, panels, isPaused, page, titleLabel, options, oldSelection, optionColors) - - if results: - panels["conn"].setSortOrder(results) - - panels["conn"].redraw(True) elif page == 2 and (key == ord('c') or key == ord('C')) and False: # TODO: disabled for now (probably gonna be going with separate pages # rather than popup menu) @@ -1446,27 +1342,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["config"].redraw(True) - elif page == 2 and (key == ord('s') or key == ord('S')): - # set ordering for config options - titleLabel = "Config Option Ordering:" - options = [configPanel.FIELD_ATTR[field][0] for field in configPanel.Field.values()] - oldSelection = [configPanel.FIELD_ATTR[field][0] for field in panels["config"].sortOrdering] - optionColors = dict([configPanel.FIELD_ATTR[field] for field in configPanel.Field.values()]) - results = showSortDialog(stdscr, panels, isPaused, page, titleLabel, options, oldSelection, optionColors) - - if results: - # converts labels back to enums - resultEnums = [] - - for label in results: - for entryEnum in configPanel.FIELD_ATTR: - if label == configPanel.FIELD_ATTR[entryEnum][0]: - resultEnums.append(entryEnum) - break - - panels["config"].setSortOrder(resultEnums) - - panels["config"].redraw(True) elif page == 2 and uiTools.isSelectionKey(key): # let the user edit the configuration value, unchanged if left blank panel.CURSES_LOCK.acquire() diff --git a/src/cli/popups.py b/src/cli/popups.py index ce51ee8..d5cf76c 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -108,3 +108,109 @@ def showHelpPopup(): return exitKey else: return None +def showSortDialog(titleLabel, options, oldSelection, optionColors): + """ + Displays a sorting dialog of the form: + + Current Order: <previous selection> + New Order: <selections made> + + <option 1> <option 2> <option 3> Cancel + + Options are colored when among the "Current Order" or "New Order", but not + when an option below them. If cancel is selected or the user presses escape + then this returns None. Otherwise, the new ordering is provided. + + Arguments: + titleLabel - title displayed for the popup window + options - ordered listing of option labels + oldSelection - current ordering + optionColors - mappings of options to their color + """ + + popup, width, height = init(9, 80) + if not popup: return + newSelections = [] # new ordering + + try: + cursorLoc = 0 # index of highlighted option + curses.cbreak() # wait indefinitely for key presses (no timeout) + + selectionOptions = list(options) + selectionOptions.append("Cancel") + + while len(newSelections) < len(oldSelection): + popup.win.erase() + popup.win.box() + popup.addstr(0, 0, titleLabel, curses.A_STANDOUT) + + _drawSortSelection(popup, 1, 2, "Current Order: ", oldSelection, optionColors) + _drawSortSelection(popup, 2, 2, "New Order: ", newSelections, optionColors) + + # presents remaining options, each row having up to four options with + # spacing of nineteen cells + row, col = 4, 0 + for i in range(len(selectionOptions)): + optionFormat = curses.A_STANDOUT if cursorLoc == i else curses.A_NORMAL + popup.addstr(row, col * 19 + 2, selectionOptions[i], optionFormat) + col += 1 + if col == 4: row, col = row + 1, 0 + + popup.win.refresh() + + key = controller.getScreen().getch() + if key == curses.KEY_LEFT: + cursorLoc = max(0, cursorLoc - 1) + elif key == curses.KEY_RIGHT: + cursorLoc = min(len(selectionOptions) - 1, cursorLoc + 1) + elif key == curses.KEY_UP: + cursorLoc = max(0, cursorLoc - 4) + elif key == curses.KEY_DOWN: + cursorLoc = min(len(selectionOptions) - 1, cursorLoc + 4) + elif uiTools.isSelectionKey(key): + selection = selectionOptions[cursorLoc] + + if selection == "Cancel": break + else: + newSelections.append(selection) + selectionOptions.remove(selection) + cursorLoc = min(cursorLoc, len(selectionOptions) - 1) + elif key == 27: break # esc - cancel + + curses.halfdelay(controller.REFRESH_RATE * 10) # reset normal pausing behavior + finally: finalize() + + if len(newSelections) == len(oldSelection): + return newSelections + else: return None + +def _drawSortSelection(popup, y, x, prefix, options, optionColors): + """ + Draws a series of comma separated sort selections. The whole line is bold + and sort options also have their specified color. Example: + + Current Order: Man Page Entry, Option Name, Is Default + + Arguments: + popup - panel in which to draw sort selection + y - vertical location + x - horizontal location + prefix - initial string description + options - sort options to be shown + optionColors - mappings of options to their color + """ + + popup.addstr(y, x, prefix, curses.A_BOLD) + x += len(prefix) + + for i in range(len(options)): + sortType = options[i] + sortColor = uiTools.getColor(optionColors.get(sortType, "white")) + popup.addstr(y, x, sortType, sortColor | curses.A_BOLD) + x += len(sortType) + + # comma divider between options, if this isn't the last + if i < len(options) - 1: + popup.addstr(y, x, ", ", curses.A_BOLD) + x += 2 +

1 0

[arm/master] Moving help popup into a new popup toolkit
by atagar＠torproject.org 07 May '11

07 May '11

commit b3fd2f2df18ce7310c33006f1d81f10bae620010 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 6 21:00:02 2011 -0700 Moving help popup into a new popup toolkit Breaking the help popup out of the controller, moving it to a nice, modular 'show popup' function. This is a drop-in replacement (besides some reordered help options) and also allowed us to move the help content into their respective panels. This is far cleaner and avoids accessing private panel parameters. Next the rest of the popups will be moved to this new toolkit, which will greatly clean up the controller. --- README | 3 +- src/cli/__init__.py | 2 +- src/cli/configPanel.py | 12 +++ src/cli/connections/connPanel.py | 16 ++++ src/cli/controller.py | 155 ++++++++++++++++---------------------- src/cli/graphing/graphPanel.py | 12 +++ src/cli/logPanel.py | 11 +++ src/cli/popups.py | 110 +++++++++++++++++++++++++++ src/cli/torrcPanel.py | 12 +++ src/util/panel.py | 9 ++ 10 files changed, 250 insertions(+), 92 deletions(-) diff --git a/README b/README index ff03b37..e7c2e2c 100644 --- a/README +++ b/README @@ -157,7 +157,8 @@ Layout: __init__.py controller.py - main display loop, handling input and layout headerPanel.py - top of all pages, providing general information - descriptorPopup.py - (popup) displays connection descriptor data + descriptorPopup.py - displays connection descriptor data + popups.py - toolkit providing display popups logPanel.py - (page 1) displays tor, arm, and torctl events configPanel.py - (page 3) editor panel for the tor configuration diff --git a/src/cli/__init__.py b/src/cli/__init__.py index 171af09..1564f68 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "torrcPanel"] +__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel"] diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index fd6fb54..90c6191 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -248,6 +248,18 @@ class ConfigPanel(panel.Panel): self.redraw(True) self.valsLock.release() + def getHelp(self): + options = [] + options.append(("up arrow", "scroll up a line", None)) + options.append(("down arrow", "scroll down a line", None)) + options.append(("page up", "scroll up a page", None)) + options.append(("page down", "scroll down a page", None)) + options.append(("enter", "edit configuration option", None)) + options.append(("w", "save configuration", None)) + options.append(("a", "toggle option filtering", None)) + options.append(("s", "sort ordering", None)) + return options + def draw(self, width, height): self.valsLock.acquire() diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 5f4f036..40c479e 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -185,6 +185,22 @@ class ConnectionPanel(panel.Panel, threading.Thread): drawTicks = (time.time() - lastDraw) / self._config["features.connection.refreshRate"] lastDraw += self._config["features.connection.refreshRate"] * drawTicks + def getHelp(self): + resolverUtil = connections.getResolver("tor").overwriteResolver + if resolverUtil == None: resolverUtil = "auto" + + options = [] + options.append(("up arrow", "scroll up a line", None)) + options.append(("down arrow", "scroll down a line", None)) + options.append(("page up", "scroll up a page", None)) + options.append(("page down", "scroll down a page", None)) + options.append(("enter", "edit configuration option", None)) + options.append(("d", "raw consensus descriptor", None)) + options.append(("l", "listed identity", self._listingType.lower())) + options.append(("s", "sort ordering", None)) + options.append(("u", "resolving utility", resolverUtil)) + return options + def draw(self, width, height): self.valsLock.acquire() diff --git a/src/cli/controller.py b/src/cli/controller.py index b8bb5cd..1501419 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -15,6 +15,7 @@ import curses.textpad import socket from TorCtl import TorCtl +import popups import headerPanel import graphing.graphPanel import logPanel @@ -30,6 +31,56 @@ import graphing.bandwidthStats import graphing.connStats import graphing.resourceStats +# TODO: controller should be its own object that can be refreshed - until that +# emulating via a 'refresh' flag +REFRESH_FLAG = False + +def refresh(): + global REFRESH_FLAG + REFRESH_FLAG = True + +# new panel params and accessors (this is part of the new controller apis) +PANELS = {} +STDSCR = None + +def getScreen(): + return STDSCR + +def getPage(): + """ + Provides the number belonging to this page. Page numbers start at one. + """ + + return PAGE + 1 + +def getPanel(name): + """ + Provides the panel with the given identifier. + + Arguments: + name - name of the panel to be fetched + """ + + return PANELS[name] + +def getPanels(page = None): + """ + Provides all panels or all panels from a given page. + + Arguments: + page - page number of the panels to be fetched, all panels if undefined + """ + + panelSet = [] + if page == None: + # fetches all panel names + panelSet = list(PAGE_S) + for pagePanels in PAGES: + panelSet += pagePanels + else: panelSet = PAGES[page - 1] + + return [getPanel(name) for name in panelSet] + CONFIRM_QUIT = True REFRESH_RATE = 5 # seconds between redrawing screen MAX_REGEX_FILTERS = 5 # maximum number of previous regex filters that'll be remembered @@ -422,6 +473,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): otherwise unrecognized events) """ + global PANELS, STDSCR, REFRESH_FLAG, PAGE + STDSCR = stdscr + # loads config for various interface components config = conf.getConfig("arm") config.update(CONFIG) @@ -609,6 +663,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): pluralLabel = "s" if len(missingEventTypes) > 1 else "" log.log(CONFIG["log.torEventTypeUnrecognized"], "arm doesn't recognize the following event type%s: %s (log 'UNKNOWN' events to see them)" % (pluralLabel, ", ".join(missingEventTypes))) + PANELS = panels + # tells revised panels to run as daemons panels["header"].start() panels["log"].start() @@ -631,6 +687,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): regexFilters = [] # previously used log regex filters panels["popup"].redraw(True) # hack to make sure popup has a window instance (not entirely sure why...) + PAGE = page + # provides notice about any unused config keys for key in config.getUnusedKeys(): log.log(CONFIG["log.configEntryUndefined"], "Unused configuration entry: %s" % key) @@ -866,6 +924,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): isVisible = i == page for entry in PAGES[i]: panels[entry].setVisible(isVisible) + PAGE = page + panels["control"].page = page + 1 # TODO: this redraw doesn't seem necessary (redraws anyway after this @@ -914,96 +974,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): finally: panel.CURSES_LOCK.release() elif key == ord('h') or key == ord('H'): - # displays popup for current page's controls - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # lists commands - popup = panels["popup"] - popup.clear() - popup.win.box() - popup.addstr(0, 0, "Page %i Commands:" % (page + 1), curses.A_STANDOUT) - - pageOverrideKeys = () - - if page == 0: - graphedStats = panels["graph"].currentDisplay - if not graphedStats: graphedStats = "none" - popup.addfstr(1, 2, "<b>up arrow</b>: scroll log up a line") - popup.addfstr(1, 41, "<b>down arrow</b>: scroll log down a line") - popup.addfstr(2, 2, "<b>m</b>: increase graph size") - popup.addfstr(2, 41, "<b>n</b>: decrease graph size") - popup.addfstr(3, 2, "<b>s</b>: graphed stats (<b>%s</b>)" % graphedStats) - popup.addfstr(3, 41, "<b>i</b>: graph update interval (<b>%s</b>)" % graphing.graphPanel.UPDATE_INTERVALS[panels["graph"].updateInterval][0]) - popup.addfstr(4, 2, "<b>b</b>: graph bounds (<b>%s</b>)" % panels["graph"].bounds.lower()) - popup.addfstr(4, 41, "<b>a</b>: save snapshot of the log") - popup.addfstr(5, 2, "<b>e</b>: change logged events") - - regexLabel = "enabled" if panels["log"].regexFilter else "disabled" - popup.addfstr(5, 41, "<b>f</b>: log regex filter (<b>%s</b>)" % regexLabel) - - hiddenEntryLabel = "visible" if panels["log"].showDuplicates else "hidden" - popup.addfstr(6, 2, "<b>u</b>: duplicate log entries (<b>%s</b>)" % hiddenEntryLabel) - popup.addfstr(6, 41, "<b>c</b>: clear event log") - - pageOverrideKeys = (ord('m'), ord('n'), ord('s'), ord('i'), ord('d'), ord('e'), ord('r'), ord('f'), ord('x')) - if page == 1: - popup.addfstr(1, 2, "<b>up arrow</b>: scroll up a line") - popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line") - popup.addfstr(2, 2, "<b>page up</b>: scroll up a page") - popup.addfstr(2, 41, "<b>page down</b>: scroll down a page") - - popup.addfstr(3, 2, "<b>enter</b>: edit configuration option") - popup.addfstr(3, 41, "<b>d</b>: raw consensus descriptor") - - listingType = panels["conn"]._listingType.lower() - popup.addfstr(4, 2, "<b>l</b>: listed identity (<b>%s</b>)" % listingType) - - popup.addfstr(4, 41, "<b>s</b>: sort ordering") - - resolverUtil = connections.getResolver("tor").overwriteResolver - if resolverUtil == None: resolverUtil = "auto" - popup.addfstr(5, 2, "<b>u</b>: resolving utility (<b>%s</b>)" % resolverUtil) - - pageOverrideKeys = (ord('d'), ord('l'), ord('s'), ord('u')) - elif page == 2: - popup.addfstr(1, 2, "<b>up arrow</b>: scroll up a line") - popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line") - popup.addfstr(2, 2, "<b>page up</b>: scroll up a page") - popup.addfstr(2, 41, "<b>page down</b>: scroll down a page") - popup.addfstr(3, 2, "<b>enter</b>: edit configuration option") - popup.addfstr(3, 41, "<b>w</b>: save configuration") - popup.addfstr(4, 2, "<b>a</b>: toggle option filtering") - popup.addfstr(4, 41, "<b>s</b>: sort ordering") - elif page == 3: - popup.addfstr(1, 2, "<b>up arrow</b>: scroll up a line") - popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line") - popup.addfstr(2, 2, "<b>page up</b>: scroll up a page") - popup.addfstr(2, 41, "<b>page down</b>: scroll down a page") - - strippingLabel = "on" if panels["torrc"].stripComments else "off" - popup.addfstr(3, 2, "<b>s</b>: comment stripping (<b>%s</b>)" % strippingLabel) - - lineNumLabel = "on" if panels["torrc"].showLineNum else "off" - popup.addfstr(3, 41, "<b>n</b>: line numbering (<b>%s</b>)" % lineNumLabel) - - popup.addfstr(4, 2, "<b>r</b>: reload torrc") - popup.addfstr(4, 41, "<b>x</b>: reset tor (issue sighup)") - - popup.addstr(7, 2, "Press any key...") - popup.refresh() - - # waits for user to hit a key, if it belongs to a command then executes it - curses.cbreak() - helpExitKey = stdscr.getch() - if helpExitKey in pageOverrideKeys: overrideKey = helpExitKey - curses.halfdelay(REFRESH_RATE * 10) - - setPauseState(panels, isPaused, page) - selectiveRefresh(panels, page) - finally: - panel.CURSES_LOCK.release() + overrideKey = popups.showHelpPopup() elif page == 0 and (key == ord('s') or key == ord('S')): # provides menu to pick stats to be graphed #options = ["None"] + [label for label in panels["graph"].stats.keys()] @@ -1585,6 +1556,10 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels["config"].handleKey(key) elif page == 3: panels["torrc"].handleKey(key) + + if REFRESH_FLAG: + REFRESH_FLAG = False + selectiveRefresh(panels, page) def startTorMonitor(startTime, loggedEvents, isBlindMode): try: diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index 238e163..d8808b3 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -253,6 +253,18 @@ class GraphPanel(panel.Panel): self.graphHeight = max(MIN_GRAPH_HEIGHT, newGraphHeight) + def getHelp(self): + if self.currentDisplay: graphedStats = self.currentDisplay + else: graphedStats = "none" + + options = [] + options.append(("m", "increase graph size", None)) + options.append(("n", "decrease graph size", None)) + options.append(("s", "graphed stats", graphedStats)) + options.append(("b", "graph bounds", self.bounds.lower())) + options.append(("i", "graph update interval", UPDATE_INTERVALS[self.updateInterval][0])) + return options + def draw(self, width, height): """ Redraws graph panel """ diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 6feb129..b12715e 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -761,6 +761,17 @@ class LogPanel(panel.Panel, threading.Thread): self.redraw(True) self.valsLock.release() + def getHelp(self): + options = [] + options.append(("up arrow", "scroll log up a line", None)) + options.append(("down arrow", "scroll log down a line", None)) + options.append(("a", "save snapshot of the log", None)) + options.append(("e", "change logged events", None)) + options.append(("f", "log regex filter", "enabled" if self.regexFilter else "disabled")) + options.append(("u", "duplicate log entries", "visible" if self.showDuplicates else "hidden")) + options.append(("c", "clear event log", None)) + return options + def draw(self, width, height): """ Redraws message log. Entries stretch to use available space and may diff --git a/src/cli/popups.py b/src/cli/popups.py new file mode 100644 index 0000000..ce51ee8 --- /dev/null +++ b/src/cli/popups.py @@ -0,0 +1,110 @@ +""" +Functions for displaying popups in the interface. +""" + +import curses + +import controller + +from util import panel, uiTools + +def init(height = -1, width = -1): + """ + Preparation for displaying a popup. This creates a popup with a valid + subwindow instance. If that's successful then the curses lock is acquired + and this returns a tuple of the... + (popup, draw width, draw height) + Otherwise this leaves curses unlocked and returns None. + + Arguments: + height - maximum height of the popup + width - maximum width of the popup + """ + + topSize = controller.getPanel("header").getHeight() + topSize += controller.getPanel("control").getHeight() + + popup = panel.Panel(controller.getScreen(), "popup", topSize, height, width) + popup.setVisible(True) + + # Redraws the popup to prepare a subwindow instance. If none is spawned then + # the panel can't be drawn (for instance, due to not being visible). + popup.redraw(True) + if popup.win != None: + panel.CURSES_LOCK.acquire() + return (popup, popup.maxX - 1, popup.maxY) + else: return None + +def finalize(): + """ + Cleans up after displaying a popup, releasing the cureses lock and redrawing + the rest of the display. + """ + + controller.refresh() + panel.CURSES_LOCK.release() + +def showHelpPopup(): + """ + 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. + """ + + popup, width, height = init(9, 80) + if not popup: return + + exitKey = None + try: + pageNum = controller.getPage() + pagePanels = controller.getPanels(pageNum) + + # the first page is the only one with multiple panels, and it looks better + # with the log entries first, so reversing the order + pagePanels.reverse() + + helpOptions = [] + for entry in pagePanels: + helpOptions += entry.getHelp() + + # test doing afterward in case of overwriting + popup.win.box() + popup.addstr(0, 0, "Page %i Commands:" % pageNum, curses.A_STANDOUT) + + for i in range(len(helpOptions)): + if i / 2 >= height - 2: break + + # draws entries in the form '<key>: <description>[ (<selection>)]', for + # instance... + # u: duplicate log entries (hidden) + key, description, selection = helpOptions[i] + if key: description = ": " + description + row = (i / 2) + 1 + col = 2 if i % 2 == 0 else 41 + + popup.addstr(row, col, key, curses.A_BOLD) + col += len(key) + popup.addstr(row, col, description) + col += len(description) + + if selection: + popup.addstr(row, col, " (") + popup.addstr(row, col + 2, selection, curses.A_BOLD) + popup.addstr(row, col + 2 + len(selection), ")") + + # tells user to press a key if the lower left is unoccupied + if len(helpOptions) < 13 and height == 9: + popup.addstr(7, 2, "Press any key...") + + popup.win.refresh() + curses.cbreak() + exitKey = controller.getScreen().getch() + curses.halfdelay(controller.REFRESH_RATE * 10) + finally: finalize() + + if not uiTools.isSelectionKey(exitKey) and \ + not uiTools.isScrollKey(exitKey) and \ + not exitKey in (curses.KEY_LEFT, curses.KEY_RIGHT): + return exitKey + else: return None + diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index b7cad86..6d7156d 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -60,6 +60,18 @@ class TorrcPanel(panel.Panel): self.valsLock.release() + def getHelp(self): + options = [] + options.append(("up arrow", "scroll up a line", None)) + options.append(("down arrow", "scroll down a line", None)) + options.append(("page up", "scroll up a page", None)) + options.append(("page down", "scroll down a page", None)) + options.append(("s", "comment stripping", "on" if self.stripComments else "off")) + options.append(("n", "line numbering", "on" if self.showLineNum else "off")) + options.append(("r", "reload torrc", None)) + options.append(("x", "reset tor (issue sighup)", None)) + return options + def draw(self, width, height): self.valsLock.acquire() diff --git a/src/util/panel.py b/src/util/panel.py index 9c3dd29..7387833 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -290,6 +290,15 @@ class Panel(): if setWidth != -1: newWidth = min(newWidth, setWidth) return (newHeight, newWidth) + def getHelp(self): + """ + Provides help information for the controls this page provides. This is a + list of tuples of the form... + (control, description, status) + """ + + return [] + def draw(self, width, height): """ Draws display's content. This is meant to be overwritten by

1 0

r24730: {} add phobos' collection of misc files related to tor and vida (in projects/misc: . phobos phobos/tor phobos/vidalia)
by Andrew Lewman 07 May '11

07 May '11

Author: phobos Date: 2011-05-07 04:03:13 +0000 (Sat, 07 May 2011) New Revision: 24730 Added: projects/misc/phobos/ projects/misc/phobos/tor/ projects/misc/phobos/tor/2008-05-03-tor-flyer.odt projects/misc/phobos/tor/2008-05-03-tor-flyer.pdf projects/misc/phobos/tor/2008-11-25-win98-tbb-1.png projects/misc/phobos/tor/2008-11-25-win98-tbb-2.png projects/misc/phobos/tor/2008-11-25-win98-tbb-3.png projects/misc/phobos/tor/2008-11-25-win98-tbb-4.png projects/misc/phobos/tor/2008-11-25-win98-tbb-5.png projects/misc/phobos/tor/2009-02-12-win98se-tor-works-0.png projects/misc/phobos/tor/2009-02-12-win98se-tor-works-1.png projects/misc/phobos/tor/2009-02-18-phobos-tbb-im-nsis-error.png projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-1.png projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-2.png projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-3.png projects/misc/phobos/tor/2009-02-27-tor-callgrind-0.png projects/misc/phobos/tor/2009-06-19-Screenshot-TorDownload-Iceweasel.png projects/misc/phobos/tor/2010-01-08-winxp-tor-im-bundle-dump.cap.gz projects/misc/phobos/tor/2010-03-14-torproject-no-flags.pdf projects/misc/phobos/tor/2010-03-14-torproject-org-with-flags.pdf projects/misc/phobos/tor/2010-03-23-mikeperry-torbutton-lovefest-2.ogv projects/misc/phobos/tor/2010-03-23-mikeperry-torbutton-lovefest.ogv projects/misc/phobos/tor/2011-03-30-12.00.01.jpg projects/misc/phobos/tor/callgrind.out.23678.gz projects/misc/phobos/tor/ccc-tor-flyer_v0.8.1.5.pdf projects/misc/phobos/tor/easy-download-start-1.png projects/misc/phobos/tor/easy-download-start-2.png projects/misc/phobos/tor/easy-download-start-3.png projects/misc/phobos/tor/easy-download-start-4.png projects/misc/phobos/tor/easy-download-start-5.png projects/misc/phobos/tor/easy-download-start-6.png projects/misc/phobos/tor/easy-download-start-7.png projects/misc/phobos/tor/easy-download-start-8.png projects/misc/phobos/tor/easy-download-start-9.png projects/misc/phobos/tor/install-tor-for-win32.html projects/misc/phobos/tor/install-tor-for-win32.js projects/misc/phobos/tor/install-tor-for-win32.swf projects/misc/phobos/tor/opannotate-1.out.gz projects/misc/phobos/tor/opannotate.out.gz projects/misc/phobos/tor/phobos-torperf.tgz projects/misc/phobos/tor/tor-button.png projects/misc/phobos/tor/toraus1.jpg projects/misc/phobos/tor/toraus2.jpg projects/misc/phobos/tor/torinstall.zip projects/misc/phobos/tor/win32-torrc.sample projects/misc/phobos/vidalia/ projects/misc/phobos/vidalia/2008-11-18-panel-new-vidalia-shot.png projects/misc/phobos/vidalia/2009-02-19-vidalia-r3559-1.png projects/misc/phobos/vidalia/2009-02-19-vidalia-r3559-2.png projects/misc/phobos/vidalia/2009-02-20-tor-callgraph-most-called-function-0.png projects/misc/phobos/vidalia/2009-02-20-vidalia-call-graph-0.png projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-2nd-most-called-function-0.png projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-geoip-resolver-0.png projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-top-function-0.png projects/misc/phobos/vidalia/2009-02-20-vidalia-callgrind.tgz projects/misc/phobos/vidalia/2009-03-05-services-window-vidalia.png projects/misc/phobos/vidalia/2009-09-06-screenshot-tor-network-map.png projects/misc/phobos/vidalia/QtNarcotics-Screenshot.png projects/misc/phobos/vidalia/Screenshot-Tor-Network-Map.png projects/misc/phobos/vidalia/vidalia-marble-1.png projects/misc/phobos/vidalia/vidalia-marble-2.png projects/misc/phobos/vidalia/vidalia-marble-3.png projects/misc/phobos/vidalia/vidalia-win32-build-bundle.txt Log: add phobos' collection of misc files related to tor and vidalia for posterity. Added: projects/misc/phobos/tor/2008-05-03-tor-flyer.odt =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-05-03-tor-flyer.odt ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/2008-05-03-tor-flyer.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-05-03-tor-flyer.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/2008-11-25-win98-tbb-1.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-11-25-win98-tbb-1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2008-11-25-win98-tbb-2.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-11-25-win98-tbb-2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2008-11-25-win98-tbb-3.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-11-25-win98-tbb-3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2008-11-25-win98-tbb-4.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-11-25-win98-tbb-4.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2008-11-25-win98-tbb-5.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2008-11-25-win98-tbb-5.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-12-win98se-tor-works-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-12-win98se-tor-works-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-12-win98se-tor-works-1.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-12-win98se-tor-works-1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-18-phobos-tbb-im-nsis-error.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-18-phobos-tbb-im-nsis-error.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-1.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-2.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-3.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-19-win98se-tor-02034-3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-02-27-tor-callgrind-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-02-27-tor-callgrind-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2009-06-19-Screenshot-TorDownload-Iceweasel.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2009-06-19-Screenshot-TorDownload-Iceweasel.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/2010-01-08-winxp-tor-im-bundle-dump.cap.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2010-01-08-winxp-tor-im-bundle-dump.cap.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/2010-03-14-torproject-no-flags.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2010-03-14-torproject-no-flags.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/2010-03-14-torproject-org-with-flags.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2010-03-14-torproject-org-with-flags.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/2010-03-23-mikeperry-torbutton-lovefest-2.ogv =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2010-03-23-mikeperry-torbutton-lovefest-2.ogv ___________________________________________________________________ Added: svn:mime-type + video/ogg Added: projects/misc/phobos/tor/2010-03-23-mikeperry-torbutton-lovefest.ogv =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2010-03-23-mikeperry-torbutton-lovefest.ogv ___________________________________________________________________ Added: svn:mime-type + video/ogg Added: projects/misc/phobos/tor/2011-03-30-12.00.01.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/2011-03-30-12.00.01.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/misc/phobos/tor/callgrind.out.23678.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/callgrind.out.23678.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/ccc-tor-flyer_v0.8.1.5.pdf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/ccc-tor-flyer_v0.8.1.5.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/easy-download-start-1.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-2.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-3.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-4.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-4.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-5.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-5.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-6.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-6.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-7.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-7.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-8.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-8.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/easy-download-start-9.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/easy-download-start-9.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/install-tor-for-win32.html =================================================================== --- projects/misc/phobos/tor/install-tor-for-win32.html (rev 0) +++ projects/misc/phobos/tor/install-tor-for-win32.html 2011-05-07 04:03:13 UTC (rev 24730) @@ -0,0 +1,14 @@ +<HTML> +<BODY> +<center><OBJECT CLASSID="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" WIDTH="800" HEIGHT="620" CODEBASE="http://active.macromedia.com/flash5/cabs/swflash.cab#version=7,0,0,0"> +<PARAM NAME=movie VALUE="install-tor-for-win32.swf"> +<PARAM NAME=play VALUE=true> +<PARAM NAME=loop VALUE=false> +<PARAM NAME=wmode VALUE=transparent> +<PARAM NAME=quality VALUE=low> +<EMBED SRC="install-tor-for-win32.swf" WIDTH=800 HEIGHT=620 quality=low loop=false wmode=transparent TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=Shoc…"> +</EMBED> +</OBJECT></center> +<SCRIPT src='install-tor-for-win32.js'></script> +</BODY> +</HTML> Property changes on: projects/misc/phobos/tor/install-tor-for-win32.html ___________________________________________________________________ Added: svn:mime-type + text/html Added: projects/misc/phobos/tor/install-tor-for-win32.js =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/install-tor-for-win32.js ___________________________________________________________________ Added: svn:mime-type + application/javascript Added: projects/misc/phobos/tor/install-tor-for-win32.swf =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/install-tor-for-win32.swf ___________________________________________________________________ Added: svn:mime-type + application/x-shockwave-flash Added: projects/misc/phobos/tor/opannotate-1.out.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/opannotate-1.out.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/opannotate.out.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/opannotate.out.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/phobos-torperf.tgz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/phobos-torperf.tgz ___________________________________________________________________ Added: svn:mime-type + application/x-gtar Added: projects/misc/phobos/tor/tor-button.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/tor-button.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/tor/toraus1.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/toraus1.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/misc/phobos/tor/toraus2.jpg =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/toraus2.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/misc/phobos/tor/torinstall.zip =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/tor/torinstall.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/misc/phobos/tor/win32-torrc.sample =================================================================== --- projects/misc/phobos/tor/win32-torrc.sample (rev 0) +++ projects/misc/phobos/tor/win32-torrc.sample 2011-05-07 04:03:13 UTC (rev 24730) @@ -0,0 +1,170 @@ +## Configuration file for a typical Tor user +## Last updated 16 July 2009 for Tor 0.2.2.1-alpha. +## (May or may not work for much older or much newer versions of Tor.) +## +## Lines that begin with "## " try to explain what's going on. Lines +## that begin with just "#" are disabled commands: you can enable them +## by removing the "#" symbol. +## +## See 'man tor', or https://www.torproject.org/tor-manual.html, +## for more options you can use in this file. +## +## Tor will look for this file in various places based on your platform: +## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc + + +## Replace this with "SocksPort 0" if you plan to run Tor only as a +## relay, and not make any local application connections yourself. +SocksPort 9050 # what port to open for local application connections +SocksListenAddress 127.0.0.1 # accept connections only from localhost +#SocksListenAddress 192.168.0.1:9100 # listen on this IP:port also + +## Entry policies to allow/deny SOCKS requests based on IP address. +## First entry that matches wins. If no SocksPolicy is set, we accept +## all (and only) requests from SocksListenAddress. +#SocksPolicy accept 192.168.0.0/16 +#SocksPolicy reject * + +## Logs go to stdout at level "notice" unless redirected by something +## else, like one of the below lines. You can have as many Log lines as +## you want. +## +## We advise using "notice" in most cases, since anything more verbose +## may provide sensitive information to an attacker who obtains the logs. +## +## Send all messages of level 'notice' or higher to C:\Documents and Settings\Application Data\Tor\notices.log +#Log notice file C:\Documents and Settings\Application Data\Tor\notices.log +## Send every possible message to C:\Documents and Settings\Application Data\Tor\debug.log +#Log debug file C:\Documents and Settings\Application Data\Tor\debug.log +## Use the system log instead of Tor's logfiles +#Log notice syslog +## To send all messages to stderr: +#Log debug stderr + +## Uncomment this to start the process in the background... or use +## --runasdaemon 1 on the command line. This is ignored on Windows; +## see the FAQ entry if you want Tor to run as an NT service. +#RunAsDaemon 1 + +## The directory for keeping all the keys/etc. By default, we store +## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. +#DataDirectory @LOCALSTATEDIR@/lib/tor + +## The port on which Tor will listen for local connections from Tor +## controller applications, as documented in control-spec.txt. +#ControlPort 9051 +## If you enable the controlport, be sure to enable one of these +## authentication methods, to prevent attackers from accessing it. +#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C +#CookieAuthentication 1 + +############### This section is just for location-hidden services ### + +## Once you have configured a hidden service, you can look at the +## contents of the file ".../hidden_service/hostname" for the address +## to tell people. +## +## HiddenServicePort x y:z says to redirect requests on port x to the +## address y:z. + +#HiddenServiceDir C:\Documents and Settings\Application Data\Tor\hidden_service/ +#HiddenServicePort 80 127.0.0.1:80 + +#HiddenServiceDir C:\Documents and Settings\Application Data\Tor\other_hidden_service/ +#HiddenServicePort 80 127.0.0.1:80 +#HiddenServicePort 22 127.0.0.1:22 + +################ This section is just for relays ##################### +# +## See https://www.torproject.org/docs/tor-doc-relay for details. + +## Required: what port to advertise for incoming Tor connections. +#ORPort 9001 +## If you want to listen on a port other than the one advertised +## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the +## line below too. You'll need to do ipchains or other port forwarding +## yourself to make this work. +#ORListenAddress 0.0.0.0:9090 + +## A handle for your relay, so people don't have to refer to it by key. +#Nickname ididnteditheconfig + +## The IP address or full DNS name for your relay. Leave commented out +## and Tor will guess. +#Address noname.example.com + +## Define these to limit how much relayed traffic you will allow. Your +## own traffic is still unthrottled. Note that RelayBandwidthRate must +## be at least 20 KB. +#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps) +#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps) + +## Use these to restrict the maximum traffic per day, week, or month. +## Note that this threshold applies to sent _and_ to received bytes, +## not to their sum: Setting "4 GB" may allow up to 8 GB +## total before hibernating. +## +## Set a maximum of 4 gigabytes each way per period. +#AccountingMax 4 GB +## Each period starts daily at midnight (AccountingMax is per day) +#AccountingStart day 00:00 +## Each period starts on the 3rd of the month at 15:00 (AccountingMax +## is per month) +#AccountingStart month 3 15:00 + +## Contact info to be published in the directory, so we can contact you +## if your relay is misconfigured or something else goes wrong. Google +## indexes this, so spammers might also collect it. +#ContactInfo Random Person <nobody AT example dot com> +## You might also include your PGP or GPG fingerprint if you have one: +#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com> + +## Uncomment this to mirror directory information for others. Please do +## if you have enough bandwidth. +#DirPort 9030 # what port to advertise for directory connections +## If you want to listen on a port other than the one advertised +## in DirPort (e.g. to advertise 80 but bind to 9091), uncomment the line +## below too. You'll need to do ipchains or other port forwarding yourself +## to make this work. +#DirListenAddress 0.0.0.0:9091 +## Uncomment to return an arbitrary blob of html on your DirPort. Now you +## can explain what Tor is if anybody wonders why your IP address is +## contacting them. See contrib/tor-exit-notice.html in Tor's source +## distribution for a sample. +#DirPortFrontPage @CONFDIR@/tor-exit-notice.html + +## Uncomment this if you run more than one Tor relay, and add the identity +## key fingerprint of each Tor relay you control, even if they're on +## different networks. You declare it here so Tor clients can avoid +## using more than one of your relays in a single circuit. See +## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers +#MyFamily $keyid,$keyid,... + +## A comma-separated list of exit policies. They're considered first +## to last, and the first match wins. If you want to _replace_ +## the default exit policy, end this with either a reject *:* or an +## accept *:*. Otherwise, you're _augmenting_ (prepending to) the +## default exit policy. Leave commented to just use the default, which is +## described in the man page or at +## https://www.torproject.org/documentation.html +## +## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses +## for issues you might encounter if you use the default exit policy. +## +## If certain IPs and ports are blocked externally, e.g. by your firewall, +## you should update your exit policy to reflect this -- otherwise Tor +## users will be told that those destinations are down. +## +#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more +#ExitPolicy accept *:119 # accept nntp as well as default exit policy +#ExitPolicy reject *:* # no exits allowed +# +## Bridge relays (or "bridges") are Tor relays that aren't listed in the +## main directory. Since there is no complete public list of them, even if an +## ISP is filtering connections to all the known Tor relays, they probably +## won't be able to block all the bridges. Also, websites won't treat you +## differently because they won't know you're running Tor. If you can +## be a real relay, please do; but if not, be a bridge! +#BridgeRelay 1 +#ExitPolicy reject *:* + Added: projects/misc/phobos/vidalia/2008-11-18-panel-new-vidalia-shot.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2008-11-18-panel-new-vidalia-shot.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-19-vidalia-r3559-1.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-19-vidalia-r3559-1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-19-vidalia-r3559-2.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-19-vidalia-r3559-2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-20-tor-callgraph-most-called-function-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-20-tor-callgraph-most-called-function-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-20-vidalia-call-graph-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-20-vidalia-call-graph-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-2nd-most-called-function-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-2nd-most-called-function-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-geoip-resolver-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-geoip-resolver-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-top-function-0.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgraph-top-function-0.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgrind.tgz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-02-20-vidalia-callgrind.tgz ___________________________________________________________________ Added: svn:mime-type + application/x-gtar Added: projects/misc/phobos/vidalia/2009-03-05-services-window-vidalia.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-03-05-services-window-vidalia.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/2009-09-06-screenshot-tor-network-map.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/2009-09-06-screenshot-tor-network-map.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/QtNarcotics-Screenshot.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/QtNarcotics-Screenshot.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/Screenshot-Tor-Network-Map.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/Screenshot-Tor-Network-Map.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/vidalia-marble-1.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/vidalia-marble-1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/vidalia-marble-2.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/vidalia-marble-2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/vidalia-marble-3.png =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/vidalia/vidalia-marble-3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/misc/phobos/vidalia/vidalia-win32-build-bundle.txt =================================================================== --- projects/misc/phobos/vidalia/vidalia-win32-build-bundle.txt (rev 0) +++ projects/misc/phobos/vidalia/vidalia-win32-build-bundle.txt 2011-05-07 04:03:13 UTC (rev 24730) @@ -0,0 +1,10 @@ +In vidalia/build, in cmd, run +cmake -DTOR_PACKAGE_DIR=/path/to/tor -DPOLIPO_PACKAGE_DIR=/path/to/polipo -DTORBUTTON_PACKAGE_DIR=/path/tor/torbutton .. + +copy the resulting pkg/win32/vidalia-bundle.nsi to \vidalia-bundle, run it from nsis compiler + +then run make i18n-win32-installer, copy the nsh files + +Russian and zh-cn probably will fail to compile in the nsi due to some +odd nullsoft bug or translation issue. Comment them out of the nsi if +needed. Property changes on: projects/misc/phobos/vidalia/vidalia-win32-build-bundle.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native

1 0

r24729: {website} add g. on the download warning page, resolves ticket 3025. (website/trunk/download/en)
by Andrew Lewman 07 May '11

07 May '11

Author: phobos Date: 2011-05-07 01:43:48 +0000 (Sat, 07 May 2011) New Revision: 24729 Modified: website/trunk/download/en/download.wml Log: add g. on the download warning page, resolves ticket 3025. Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-05-07 01:39:43 UTC (rev 24728) +++ website/trunk/download/en/download.wml 2011-05-07 01:43:48 UTC (rev 24729) @@ -257,6 +257,12 @@ you and the more <a href="<page about/torusers>">diverse</a> their interests, the less dangerous it will be that you are one of them. </li> + +<li> Do not use <a +href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent +and Tor</a> together unless you are using a system like <a +href="http://tails.boum.org/">TAILS</a>. +</li> </ol> <br> <p>

1 0

r24728: {website} link to the sponsor todo lists rather than the outdated TODO (website/trunk/docs/en)
by Andrew Lewman 07 May '11

07 May '11

Author: phobos Date: 2011-05-07 01:39:43 +0000 (Sat, 07 May 2011) New Revision: 24728 Modified: website/trunk/docs/en/documentation.wml Log: link to the sponsor todo lists rather than the outdated TODO file in git, attempt to resolve ticket 1881. Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2011-05-06 20:25:38 UTC (rev 24727) +++ website/trunk/docs/en/documentation.wml 2011-05-07 01:39:43 UTC (rev 24728) @@ -144,7 +144,8 @@ </li> <li> - Our <a href="<gitblob>doc/TODO">developer TODO file</a> starts with a + Our <a + href="https://trac.torproject.org/projects/tor/wiki/sponsors">sponsor TODO list</a> starts with a timeline for external promises — things <a href="<page about/sponsors>">our sponsors</a> have paid to see done. It also lists many other tasks and topics we'd like to tackle next.

1 0

r24727: {website} make the russian overview.wml include the sidenav (website/trunk/about/ru)
by Runa Sandvik 06 May '11

06 May '11

Author: runa Date: 2011-05-06 20:25:38 +0000 (Fri, 06 May 2011) New Revision: 24727 Modified: website/trunk/about/ru/overview.wml Log: make the russian overview.wml include the sidenav Modified: website/trunk/about/ru/overview.wml =================================================================== --- website/trunk/about/ru/overview.wml 2011-05-06 20:21:50 UTC (rev 24726) +++ website/trunk/about/ru/overview.wml 2011-05-06 20:25:38 UTC (rev 24727) @@ -274,7 +274,7 @@ <div id = "sidecol"> - #include "side.wmi" +#include "side.wmi" #include "info.wmi" </div>

1 0

r24726: {website} fixed German overview.wml (website/trunk/about/de)
by Runa Sandvik 06 May '11

06 May '11

Author: runa Date: 2011-05-06 20:21:50 +0000 (Fri, 06 May 2011) New Revision: 24726 Modified: website/trunk/about/de/overview.wml Log: fixed German overview.wml Modified: website/trunk/about/de/overview.wml =================================================================== --- website/trunk/about/de/overview.wml 2011-05-06 13:55:07 UTC (rev 24725) +++ website/trunk/about/de/overview.wml 2011-05-06 20:21:50 UTC (rev 24726) @@ -62,7 +62,7 @@ ihnen oder von ihrer Familie zurückverfolgen können, um Nachrichtenseiten aufzurufen oder um Instant Messanger zu nutzen, insbesondere, wenn diese durch den örtlichen Internetanbieter geblockt werden. Die <a href="<page -docs/hidden-services>"Hidden Services<a/> erlauben es Benutzern, Websites +docs/hidden-services>"Hidden Services</a> erlauben es Benutzern, Websites und andere Dienste zu veröffentlichen, ohne dabei den Standort der Seite preisgeben zu müssen. Einzelpersonen nutzen Tor außerdem für sensible Kommunikation wie Chatrooms und Foren für Opfer von Missbrauch und @@ -209,8 +209,7 @@ <a name="hiddenservices"></a> - <h3><a class="anchor" href="#hiddenservices"Hidden Services - Versteckte -Dienste</a></h3> + <h3><a class="anchor" href="#hiddenservices">Hidden Services - Versteckte Dienste</a></h3> <p> Tor ermöglicht es seinen Benutzern auch, ihren Standort zu verstecken,

1 0

r24725: {website} updated German index.wml based on feedback from Joerg Schier (website/trunk/de)
by Runa Sandvik 06 May '11

06 May '11

Author: runa Date: 2011-05-06 13:55:07 +0000 (Fri, 06 May 2011) New Revision: 24725 Modified: website/trunk/de/index.wml Log: updated German index.wml based on feedback from Joerg Schiermeier Modified: website/trunk/de/index.wml =================================================================== --- website/trunk/de/index.wml 2011-05-06 13:53:39 UTC (rev 24724) +++ website/trunk/de/index.wml 2011-05-06 13:55:07 UTC (rev 24725) @@ -35,7 +35,7 @@ persönliche Freiheit und Privatsphäre bedroht, deine vertraulichen Geschäfts Aktivitäten und Beziehungen zu schützen, und Staatssicherheit bekannt als <a href="<page about/overview>">Daten Analyse</a><br><span class="continue"> zu -verhindern <a href="<page about/overview>">Lehrn mehr über Tor +verhindern <a href="<page about/overview>">Mehr über Tor »</a></span></p> </div>

1 0

[tor/master] Link to libevent_openssl statically when requested
by nickm＠torproject.org 06 May '11

06 May '11

commit e36f9d1d9beec0daed57b68f936293dccc77b171 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri May 6 15:34:00 2011 +0200 Link to libevent_openssl statically when requested When configure tor with --enable-bufferevents and --enable-static-libevent, libevent_openssl would still be linked dynamically. Fix this and refactor src/or/Makefile.am along the way. --- changes/bug3118 | 4 ++++ configure.in | 9 +++++++-- src/or/Makefile.am | 7 +------ src/test/Makefile.am | 8 +------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/changes/bug3118 b/changes/bug3118 new file mode 100644 index 0000000..c702981 --- /dev/null +++ b/changes/bug3118 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correctly link libevent_openssl when --enable-static-libevent + is passed to configure. Fixes bug 3118; bugfix on 0.2.3.1-alpha. + diff --git a/configure.in b/configure.in index 58d32a1..26c933b 100644 --- a/configure.in +++ b/configure.in @@ -410,7 +410,6 @@ if test "$enable_static_libevent" = "yes"; then else TOR_LIBEVENT_LIBS="-levent" fi -AC_SUBST(TOR_LIBEVENT_LIBS) dnl This isn't the best test for Libevent 2.0.3-alpha. Once it's released, dnl we can do much better. @@ -458,8 +457,14 @@ CPPFLAGS="$save_CPPFLAGS" AM_CONDITIONAL(USE_BUFFEREVENTS, test "$enable_bufferevents" = "yes") if test "$enable_bufferevents" = "yes"; then - AC_DEFINE(USE_BUFFEREVENTS, 1, [Defined if we're going to use Libevent's buffered IO API]) + AC_DEFINE(USE_BUFFEREVENTS, 1, [Defined if we're going to use Libevent's buffered IO API]) + if test "$enable_static_libevent" = "yes"; then + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS" + else + TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS" + fi fi +AC_SUBST(TOR_LIBEVENT_LIBS) dnl ------------------------------------------------------ dnl Where do you live, openssl? And how do we call you? diff --git a/src/or/Makefile.am b/src/or/Makefile.am index f0d5a0f..a12d56b 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -69,17 +69,12 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # This seems to matter nowhere but on windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. -if USE_BUFFEREVENTS -levent_openssl_lib = -levent_openssl -else -levent_openssl_lib = -endif tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib) + @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = \ buffers.h \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 174c1af..a4f93d1 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -22,18 +22,12 @@ test_SOURCES = \ test_util.c \ tinytest.c -if USE_BUFFEREVENTS -levent_openssl_lib = -levent_openssl -else -levent_openssl_lib = -endif - test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib) + @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = \ tinytest.h \

1 0

r24724: {website} new and updated translations for the website (in website/trunk: . docs/fr docs/pl download/fr fr projects projects/it torbutton/de)
by Runa Sandvik 06 May '11

06 May '11

Author: runa Date: 2011-05-06 13:53:39 +0000 (Fri, 06 May 2011) New Revision: 24724 Added: website/trunk/docs/fr/tor-doc-windows.wml website/trunk/download/fr/download.wml website/trunk/fr/index.wml website/trunk/projects/it/ website/trunk/projects/it/sidenav.wmi website/trunk/projects/it/vidalia.wml website/trunk/torbutton/de/index.wml Modified: website/trunk/Makefile website/trunk/docs/pl/faq.wml Log: new and updated translations for the website Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-05-06 10:01:11 UTC (rev 24723) +++ website/trunk/Makefile 2011-05-06 13:53:39 UTC (rev 24724) @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/home/runa/dev/tor/.git +export TORGIT=/home/runa/tordev/tor/.git export STABLETAG=tor-0.2.2.25-alpha export DEVTAG=tor-0.2.2.25-alpha Added: website/trunk/docs/fr/tor-doc-windows.wml =================================================================== --- website/trunk/docs/fr/tor-doc-windows.wml (rev 0) +++ website/trunk/docs/fr/tor-doc-windows.wml 2011-05-06 13:53:39 UTC (rev 24724) @@ -0,0 +1,198 @@ + + + + + +## translation metadata +# Revision: $Revision: 24504 $ +# Translation-Priority: 1-high +#include "head.wmi" TITLE="Tor Project: MS Windows Install Instructions" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> <a href="<page +docs/documentation>">Documentation » </a> <a href="<page +docs/tor-doc-windows>">Client Windows</a> + </div> + <div id="maincol"> + <h1>Exécution du client <a href="<page index>">Tor</a> pour Microsoft Windows</h1> + <br> + + <p> + <b>Notez que ce sont les instructions d'installation pour utiliser le client +Tor sous Microsoft Windows (XP, Vista, 7, et éditions Server). Si vous +voulez installer un relai Tor pour aider à faire grandir le réseau (ce que +nous vous enourageons à faire), lisez le guide <a href="<page +docs/tor-doc-relay>">Configuration d'un relai.</a></b> + </p> + + <p>Freedom House a produit une vidéo sur comment installer Tor. Vous pouvez la +consulter à <a +href="https://media.torproject.org/video/2009-install-and-use-tor.ogv">Comment +faire pour installer Tor sur Windows</a> . Vous connaissez une vidéo de +meilleure qualité, ou une version traduite dans votre langue? Faites-le-nous +savoir!</p> + + <div class="center"> + <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p> + </div> + + <hr> <a id="installing"></a> + <h2><a class="anchor" href="#installing">Etape Une1: Télécharger et installer +Tor</a></h2> + <br> + + <p> + Le bundle Vidalia pour Windows contient <a href="<page index>">Tor</a> , <a +href="<page projects/vidalia>">Vidalia</a> (une interface graphique pour +Tor), <a href="<page torbutton/index>">Torbutton</a> (un plugin pour Mozilla +Firefox), et <a +href="http://www.pps.jussieu.fr/~jch/software/polipo/">Polipo</a> (un proxy +web) archivés dans un paquet, avec les quatre applications pré-configurées +pour fonctionner ensemble. Téléchargez soit la version <a +href="../<package-win32-bundle-stable>">stable</a> ou l' <a +href="../<package-win32-bundle-alpha>">expérimentale</a> de Vidalia, ou +cherchez des options supplémentaires sur la <a href="<page +download/download>">page de téléchargement</a> . + </p> + + <img alt="page de démarrage de l'installateur de tor" +src="$(IMGROOT)/screenshot-win32-installer-splash.png"> + + <p>Si vous avez déjà installé Tor, Vidalia, ou Polipo, vous pouvez le +déselectionner dans la boite de dialogue ci-dessous. + </p> + + <img alt="sélectionnez les composants à installer" +src="$(IMGROOT)/screenshot-win32-installer-components.png"> + + <p>Après avoir terminé l'installation, les composants sélectionnés seront +automatiquement démarrés pour vous. + </p> + + <p>Par défaut, Tor est configuré en tant que client seul. Il utilise un fichier +de configuration intégré, et la plupart des utilisateurs d'auront pas à +changer les paramètres. Tor est maintenant installé. + </p> + + <hr> <a id="using"></a> + <h2><a class="anchor" href="#using">Etape Deux: Configurer vos applications pour +utiliser Tor</a></h2> + <br> + + <p>Après avoir installé Tor et Polipo, vous devez configurer vos applications +pour qu'elles les utilisent. La première étape consiste à configurer le +navigateur web.</p> + + <p>Vous devriez utiliser Tor avec Firefox et Torbutton, pour une meilleure +sécurité. Le bundle installe le <a href="<page torbutton/index>">plugin +Torbutton</a> pour vous. Redémarrez Firefox, et le plugin est chargé: + </p> + + <img alt="Plugin Torbutton pour Firefox" +src="$(IMGROOT)/screenshot-torbutton.png"/><br> + + <p> + Si vous envisagez d'utiliser Firefox sur un ordinateur différent de celui +sur lequel Tor tourne, consultez la <a +href="<wikifaq>#SocksListenAddress">FAQ pour faire tourner Tor sur un +ordinateur différent</a> . + </p> + + <p>Pour torifier d'autres applications qui gèrent les proxies HTTP, faites les +simplement pointer vers Polipo (c'est-à dire localhost port 8118). Pour +utiliser SOCKS directement (pour la messagerie instantanée, Jabber, IRC, +etc), vous pouvez pointer votre application directement vers Tor +(localhost port 9050), mais voir <a href="<wikifaq>#SOCKSAndDNS">cette +entrée de la FAQ</a> pour savoir pourquoi cela peut être dangereux. Pour les +applications qui ne gèrent ni SOCKS ni HTTP, jetez un oeil à SocksCap ou <a +href="http://www.freecap.ru/eng/">FreeCap</a> . (FreeCap est un logiciel +libre; SocksCap est propriétaire.)</p> + + <p>Pour plus d'informations sur comment torifier d'autres applications, +consultez le <a href="<wiki>/TheOnionRouter/TorifyHOWTO">Torifaction +HOWTO</a> . + </p> + + <hr> <a id="verify"></a> + <h2><a class="anchor" href="#verify">Troisième Etape: Assurez-vous que ça +fonctionne</a></h2> + <br> + + <p> + Vérifiez que Vidalia est en cours d'exécution. Vidalia s'affiche comme un +petit oignon vert pour indiquer Tor est en cours d'exécution ou un oignon +sombre avec une croix rouge "X" lorsque Tor ne fonctionne pas. Vous pouvez +démarrer ou arrêter Tor en effectuant un clic droit sur l'icone de Vidalia +dans votre barre d'état système et en sélectionnant "Démarrer" ou "Arrêter" +du menu présenté ci-dessous: + </p> + + <img alt="Icône de la barre Vidalia" +src="$(IMGROOT)/screenshot-win32-vidalia.png"/> + + <p> + Ensuite, vous devriez essayer votre navigateur web avec Tor et vous assurer +que votre adresse IP est anonymisée. Cliquez sur <a +href="https://check.torproject.org/">le détecteur Tor</a> et voyez s'il +pense que vous utilisez Tor ou non. (Si le site est inaccessible, voyez <a +href="<wikifaq>#IsMyConnectionPrivate">cette entrée de la FAQ</a> pour plus +de suggestions sur la façon de tester votre Tor.) + </p> + + <p>Si vous avez un pare-feu personnel qui limite la capacité de votre +ordinateur à se connecter à lui-même, assurez-vous d'autoriser les +connexions depuis vos applications locales aux ports 8118 et 9050. Si le +pare-feu bloque les connexions sortantes, ouvrez un chemin pour qu'il puisse +se connecter au moins sur les ports TCP 80 et 443, et ensuite voir <a +href="<wikifaq>#FirewalledClient">cette FAQ</a> . + </p> + + <p>Si ça ne fonctionne toujours pas, consultez <a href="<page +docs/faq>#DoesntWork">cette FAQ</a> pour obtenir des conseils.</p> + + <p> + Une fois que ça fonctionne, apprenez-en plus sur <a href="<page +download/download>#Warning">ce que Tor propose et ne propose pas</a> . + </p> + + <hr> <a id="server"></a> <a id="relay"></a> + <h2><a class="anchor" href="#relay">Étape Quatre: configurer Tor comme relai</a></h2> + <br> + + <p>Le réseau Tor compte sur les volontaires pour donner de leur bande +passante. Plus il y aura des gens qui feront tourner un relais, plus le +réseau Tor sera rapide. Si vous avez au moins 20 kilo-octets/s dans chaque +sens, s'il vous plaît aider Tor en configurant votre Tor en mode relai +également. Vous disposez de plusieurs options qui rendent l'utilisation de +Tor en tant que relai facile et pratique, y compris la limitation de bande +passante, les politiques de sortie afin que vous puissiez limiter votre +expositions aux plaintes, et le support des adresses IP dynamiques.</p> + + <p>Avoir des relais dans de nombreux lieux différents sur Internet est ce qui +sécurise les utilisateurs. <a href="<wikifaq>#RelayAnonymity">Vous pouvez +également obtenir d'avantage d'anonymat</a> , car les sites distants ne peut +pas savoir si les connexions proviennent de votre ordinateur ou si elle est +relayée par d'autres.</p> + + <p>Apprenez-en plus en lisant notre guide <a href="<page +docs/tor-doc-relay>">configuration d'un relai.</a></p> + + <hr> + + <p>Si vous avez des suggestions pour améliorer ce document, vous pouvez <a +href="<page about/contact>">nous les envoyez</a> . Merci!</p> + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Modified: website/trunk/docs/pl/faq.wml =================================================================== --- website/trunk/docs/pl/faq.wml 2011-05-06 10:01:11 UTC (rev 24723) +++ website/trunk/docs/pl/faq.wml 2011-05-06 13:53:39 UTC (rev 24724) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 24579 $ +# Revision: $Revision: 24720 $ # Translation-Priority: 2-medium #include "pl/head.wmi" TITLE="Tor Project: FAQ" CHARSET="UTF-8" <div id="content" class="clearfix"> @@ -1442,15 +1442,14 @@ </p> <p> -Rozwiązaniem są "strażnicy wejściowi": każdy użytkownik wybiera kilka -przekaxników losowo, by służyły jako punkty wejścia i używa tylko tych -przekaźników do pierwszego skoku. Jeśli te przekaźniki nie są kontrolowane -ani obserwowane, napatnik nigdy nie może wygrać i użytkownik jest -bezpieczny. Jeśli te przekaźniki <i>są</i> obserwowane lub kontrolowane -przez napastnika, widzi on większą <i>część</i> ruchu użytkownika — -ale użytkownik i tak nie jest bardziej profilowany niż przedtem. Tak więc, -użytkownik ma jakieś szanse (rzędu <i>(n-c)/n</i>) na uniknięcie -profilowania, a przedtem nie miał żadnych. +The solution is "entry guards": each Tor client selects a few relays at +random to use as entry points, and uses only those relays for her first +hop. If those relays are not controlled or observed, the attacker can't win, +ever, and the user is secure. If those relays <i>are</i> observed or +controlled by the attacker, the attacker sees a larger <i>fraction</i> of +the user's traffic — but still the user is no more profiled than +before. Thus, the user has some chance (on the order of <i>(n-c)/n</i>) of +avoiding profiling, whereas she had none before. </p> <p> Added: website/trunk/download/fr/download.wml =================================================================== --- website/trunk/download/fr/download.wml (rev 0) +++ website/trunk/download/fr/download.wml 2011-05-06 13:53:39 UTC (rev 24724) @@ -0,0 +1,431 @@ + + + + + +## translation metadata +# Revision: $Revision: 24703 $ +# Translation-Priority: 3-low +#include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> +<div id="breadcrumbs"><a href="<page index>">Accueil »</a> <a href="<page +download/download>">Téléchargement</a></div> +<div id="maincol-left"> +<h1>Télécharger Tor</h1> + + +<div class="warning"> +<h2>Voulez-vous vraiment que Tor fonctionne?</h2> +<p>... alors s'il vous plaît ne faites pas que l'installer et utiliser +directement vos applications. Vous devez changer certaines de vos habitudes, +et reconfigurer vos logiciels! Tor en lui même n'est <em>PAS</em> suffisant +pour garantir votre anonymat. Lire la <a href="#warning">liste complète des +mises en garde</a> . +</p> +</div> + + + + +<table class="topforty"> +<tr> +<td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td> +</tr> +<tr> +<td>Tor pour Windows est livré de quatre façons différentes: +<ul> +<li>Le <strong>navigateur Tor Bundle</strong> est un paquetage qui contient tout +ce dont vous avez besoin pour naviguer sur Internet en toute sécurité. Il ne +nécessite aucune installation. Il suffit de l'extraire et de l'exécuter. <a +href="<page projects/torbrowser>">En savoir plus »</a></li> +<li>Le <strong>Paquetage Vidalia</strong> contient Tor, <a href="<page +projects/vidalia>">Vidalia</a> , Polipo, et Torbutton, pour l'installation +sur votre système. Vous aurez besoin de votre propre logiciel Firefox, et +vous aurez besoin de configurer d'autres applications si vous souhaitez les +utiliser avec Tor.</li> +<li>Le <strong>Paquetage Pont-par-Default Vidalia </strong> est un +<strong>Paquetage Vidalia</strong> qui est configuré pour être faire office +de <a href="<page docs/bridges>">pont</a> pour aider les utilisateurs +censurés à accéder au réseau Tor.</li> +<li>Les <strong>Paquetage Expert</strong> ne contient que Tor et rien +d'autre. Vous aurez besoin de configurer Tor et toutes vos applications +manuellement.</li> +</ul> +<p>Il existe deux versions de chaque paquet, une version stable et une version +alpha. Les paquetages Stable sont diffusés lorsque nous pensons que les +caractéristiques et le code n'auront pas besoin d'être modifiés pendant +plusieurs mois. Les paquetages Alpha ou instables sont libérés afin que vous +puissiez nous aider à tester de nouvelles fonctionnalités et à détecter et +corriger des bugs. Même s'ils ont un numéro de version supérieur à celui des +versions stables listés ci-dessus, il y a beaucoup plus de chances que des +failles de fiabilité et de sécurité y soient présentes. Merci d'avance de +nous <a href="https://bugs.torproject.org/">signaler des bugs</a> si vous en +rencontrez.</p> +<p>La version stable actuelle de Tor pour Windows est +<version-win32-stable>. L'alpha / version instable en cours de Tor pour +Windows est <version-win32-alpha>.</p> +</td> +</tr> +<tr class="gray"> +<td><span class="windows">La version (en français) du Paquetage Tor</span> +<version-torbrowserbundle> <span class="windows"> fonctionne avec Windows 7, +Vista et XP. <a +href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">Télécharger</a> +( <a +href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe.asc">SIG</a> +)</span> +</td> +</tr> +<tr> +<td><span class="windows">Le développement du Paquetage navigateur Tor de +messagerie instantanée (en anglais) a été <a +href="https://blog.torproject.org/blog/tor-im-browser-bundle-discontinued-tempora…">temporairement +interrompu</a> .</span> + </td> +</tr> + <tr class="gray"> + <td><span class="windows">Télécharger <a href="<page +projects/torbrowser>">d'autres versions linguistiques et le code source</a> +du navigateur Bundle Tor.</span> +</td> +</tr> + <tr><td><span class="windows">Paquetage Vidalia Stable fonctionne avec Windows 7, +Vista, XP, <a href="<package-win32-bundle-stable>">Téléchargement version +stable</a> ( <a href="<package-win32-bundle-stable>.asc">sig</a> )</span></td> + </tr> + <tr class="gray"><td><span class="windows">Le Paquetage Vidalia Instable fonctionne avec Windows +7, Vista, XP, <a href="<package-win32-bundle-alpha>">Télécharger la version +instable</a> ( <a href="<package-win32-bundle-alpha>.asc">sig</a> )</span></td> + </tr> + <tr class="gray"><td><span class="windows">Le Paquetage Pont-par-Défaut de Vidalia fonctionne +avec Windows 7, Vista, XP, <a +href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe">Télécharger +la version instable</a> ( <a +href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.asc">sig</a> +)</span></td> + </tr> + <tr> + <td><span class="windows">Stable experts Bundle fonctionne avec Windows 98SE, +ME, Windows 7, Vista, XP, 2000, 2003 Server, <a +href="../dist/win32/tor-<version-win32-stable>-win32.exe">Téléchargement +version stable</a> ( <a +href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">SIG</a> +)</span></td> +</tr> + <tr class="gray"> + <td><span class="windows">Le Paquetage Expert Instable fonctionne avec Windows +98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, <a +href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Télécharger la +version instable</a> ( <a +href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a> +)</span></td> + </tr> + <tr> +<td> +<a href="<page docs/tor-doc-windows>">Documentation pour les clients +Microsoft Windows</a> +</td> +</tr> +</table> + + + + +<table class="topforty"> +<tr> +<td class="nopad"><div class="title"><a name="mac">Apple OS X</a></div></td> +</tr> +<tr> +<td class="intro">Le logiciel Tor pour OS X est livré de deux façons différentes: +<ul> +<li>Le <strong>navigateur Tor Bundle</strong> est un paquetage qui contient tout +ce dont vous avez besoin pour naviguer sur Internet en toute sécurité. Il ne +nécessite aucune installation. Il suffit de l'extraire et de l'exécuter. <a +href="<page projects/torbrowser>">En savoir plus »</a></li> +<li>Le <strong>Paquetage Vidalia</strong> contient Tor, <a href="<page +projects/vidalia>">Vidalia</a> , Polipo, et Torbutton pour installation sur +votre système. Vous aurez besoin de votre propre logiciel Firefox, et vous +aurez besoin de configurer d'autres applications si vous souhaitez les +utiliser avec Tor.</li> +</ul> +<p>Il existe deux versions de chaque paquet, une version stable et une version +alpha. Les paquetages Stable sont diffusés lorsque nous pensons que les +caractéristiques et le code n'auront pas besoin d'être modifiés pendant +plusieurs mois. Les paquetages Alpha ou instables sont libérés afin que vous +puissiez nous aider à tester de nouvelles fonctionnalités et à détecter et +corriger des bugs. Même s'ils ont un numéro de version supérieur à celui des +versions stables listés ci-dessus, il y a beaucoup plus de chances que des +failles de fiabilité et de sécurité y soient présentes. Merci d'avance de +nous <a href="https://bugs.torproject.org/">signaler des bugs</a> si vous en +rencontrez.</p> +<p>La version stable actuelle de Tor pour OS X est <version-osx-x86-stable> +. La version actuelle alpha / instable de Tor pour OS X est +<version-osx-x86-alpha>.</p> +</td> +</tr> +<tr class="gray"> +<td><span class="mac">Navigateur Tor Bundle pour OS X Intel (version bêta), <a +href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Télécharger</a> +( <a +href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a> +)</span> +</td> +</tr> +<tr> +<td><span class="mac">Bundle Vidalia Stable pour OS X Intel, <a +href="<package-osx-x86-bundle-stable>">Téléchargement de la version +stable</a> ( <a href="<package-osx-x86-bundle-stable>.asc">sig</a> )</span></td> +</tr> +<tr class="gray"> +<td><span class="mac">Bundle Vidalia Instable pour OS X Intel, <a +href="<package-osx-x86-bundle-alpha>">Téléchargement de la version +instable</a> ( <a href="<package-osx-x86-bundle-alpha>.asc">sig</a> )</span></td> +</tr> +<tr> +<td><span class="mac">Bundle Vidalia Stable pour OS X PowerPC, <a +href="<package-osx-ppc-bundle-stable>">Téléchargement de la version +stable</a> ( <a href="<package-osx-ppc-bundle-stable>.asc">sig</a> )</span></td> +</tr> +<tr class="gray"> +<td><span class="mac">Bundle Vidalia Instable pour OS X PowerPC, <a +href="<package-osx-ppc-bundle-alpha>">Téléchargement de la version +instable</a> ( <a href="<package-osx-ppc-bundle-alpha>.asc">sig</a> )</span></td> +</tr> +<tr> +<td><a href="<page docs/tor-doc-osx>">Documentation pour les clients OS X +d'Apple</a>.</td> +</tr> +</table> + + +  + +<table class="topforty"> +<tr> +<td class="nopad"><div class="title"><a name="linux">Linux/Unix</a></div></td></tr> +<tr> +<td class="intro">Le logiciel Tor est livré de deux façons différentes: +<ul> +<li>Le <strong>navigateur Tor Bundle</strong> est un paquetage qui contient tout +ce dont vous avez besoin pour naviguer sur Internet en toute sécurité. Il ne +nécessite aucune installation. Il suffit de l'extraire et de l'exécuter. <a +href="<page projects/torbrowser>">En savoir plus »</a></li> +<li>Lire le mode d'emploi d'utilisation <a href="<page +download/download-unix>">de nos dépots pour Tor</a> .</li> +</ul> +</td> +</tr> +<tr class="gray"> +<td><span class="linux">Le Paquetage du navigateur Tor pour GNU/Linux (version +beta) pour i686, <a +href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">Télécharger</a> +( <a +href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz.asc">sig</a> +)</span></td> +</tr> +<tr> +<td><span class="linux">Le Paquetage du navigateur Tor pour GNU/Linux (version +beta) pour x86_64, <a +href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz">Télécharger</a> +( <a +href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz.asc">sig</a> +)</span></td> +</tr> +<tr class="gray"> +<td><span class="linux">Utilisez <a href="<page download/download-unix>">nos +dépots</a> pour tous les autres logiciels faisant appel à Tor.</span></td> +</tr> +</table> +<table class="topforty"> +<tr> +<td class="nopad"><div class="title"><a name="smartphones">Tor pour Smartphones</a></div></td> +</tr> +<tr class="gray"> +<td colspan="2">Smartphones basés sur Android, tablettes, ordinateurs</td> +<td><a +href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk">Bundle +Android</a></td> +<td><a href="<page docs/android>">Instructions Android</a></td> +</tr> +<tr> +<td colspan="2">iPhone, iPod Touch, iPad</td> +<td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test des +packetages par Marco</a></span></td> +</tr> +<tr class="gray"> +<td>Nokia Maemo/N900</td> +<td></td> +<td><span class="nokia"><a href="<page docs/N900>">Instructions +Expérimentales</a></span></td> +<td></td> +</tr> +</table> + + + + +<table class="topforty"> +<tr> +<td class="nopad"><div class="title"><a name="source">Code Source</a></div></td> +</tr> +<tr> +<td colspan="2">La version stable actuelle de Tor est <version-stable> . Ses <a +href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog">notes +de version (release notes)</a> sont disponibles.</td> +<td colspan="2">La version actuelle instable/alpha de Tor est <version-alpha>. Son <a +href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/Change…">journal +des modifications</a> est disponible.</td> +</tr> +<tr class="gray"> +<td>Tarballs (archives tar) source</td> +<td>./configure && make && src/or/tor</td> +<td><a href="../dist/tor-<version-stable>.tar.gz">Télécharger la version +stable</a> ( <a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a> )</td> +<td><a href="../dist/tor-<version-alpha>.tar.gz">Télécharger la version +instable</a> ( <a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a> )</td> +</tr> +</table> + + + +<br> + +<div class="warning"> +<a name="warning"></a> <a name="Warning"></a> +<h2><a class="anchor" href="#warning">Voulez-vous vraiment que Tor +fonctionne?</a></h2> +<p>... alors s'il vous plaît ne faites pas que l'installer et utiliser +directement vos applications. Vous devez changer certaines de vos habitudes, +et reconfigurer vos logiciels! Tor en lui même n'est <em>PAS</em> suffisant +pour garantir votre anonymat. Il existe plusieurs pièges auxquels il faut +prendre garde: +</p> + +<ol> +<li> +Tor protège seulement les applications Internet qui sont configurées pour +envoyer leur trafic internet à travers Tor — il ne vient pas +anonymiser de manière magique votre trafic, juste parce que vous l'avez +installé. Nous vous recommandons d'utiliser <a +href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> avec +l'extension <a href="<page torbutton/index>">Torbutton</a>. +</li> + +<li> +Torbutton bloque les plugins tels que Java, Flash, ActiveX, RealPlayer, +Quicktime, Acrobat Reader, et d'autres: ils peuvent en effet être manipulés +pour révéler votre adresse IP. Par exemple, cela signifie que Youtube est +désactivé. Si vous avez vraiment besoin de votre Youtube, vous pouvez <a +href="<page torbutton/torbutton-faq>#noflash">reconfigurer Torbutton</a> +pour le lui permettre, mais sachez que vous vous exposez à une attaque +potentielle. En outre, des extensions comme la barre d'outils Google +collectent plus d'informations sur les sites web que vous entrez: ils +pourraient évitent Tor et/ou largement diffuser des informations +sensibles. Certaines personnes préfèrent utiliser deux navigateurs +différents (l'un pour Tor, l'autre pour la navigation non-Tor). +</li> + +<li> +Méfiez-vous des cookies: si vous avez déjà utilisé votre navigateur sans Tor +et qu'un site a installé un cookie, celui-ci pourrait révéler votre identité +même si vous utilisez Tor à nouveau. Torbutton tente de gérer vos cookies en +toute sécurité. <a +href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> peut lui vous +aider à protéger les cookies que vous ne souhaitez pas perdre. +</li> + +<li> +Tor anonymise l'origine de votre trafic et chiffre tout entre vous et le +réseau Tor et tout l'intérieur du réseau Tor, mais <a +href="<wikifaq>#SoImtotallyanonymousifIuseTor">il ne peut pas chiffrer votre +trafic entre le réseau Tor et sa destination finale.</a> Si vous envoyez des +informations sensibles, vous devriez prendre autant de précautions que vous +n'utilisiez pas Tor — ou alors utilisez HTTPS ou un autres moyen de +chiffrage et d'authentification d'un bout à l'autre de la connexion. <a +href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> est une +extension Firefox produit d'une collaboration entre le projet Tor et +l'Electronic Frontier Foundation. Elle chiffre vos communications avec un +certain nombre de sites importants. +</li> + +<li> +Tandis que Tor bloque les attaquants sur votre réseau local en masquant +votre destination, il ouvre de nouveaux risques: des nodes de sortie +mal-intentionnés ou mal configurés de Tor peut vous envoyer la mauvaise page +web, ou même vous envoyer des applets Java déguisées en domaines en qui vous +avez confiance. Soyez prudent en ouvrant des documents ou des applications +que vous téléchargez via Tor, à moins que vous n'ayez vérifié leur intégrité +auparavant. +</li> + +<li> +Tor tente d'empêcher les attaquants d'apprendre quelles sont les +destinations auxquelles vous vous connectez. Il n'empêche pas quelqu'un qui +surveille votre trafic d'apprendre que vous utilisez Tor. Vous pouvez +réduire (mais pas résoudre complètement) ce risque en utilisant un <a +href="<page docs/bridges>">relais-pont Tor</a> plutôt que de vous connecter +directement au réseau Tor public, mais en fin de compte la meilleure +protection est une approche sociétale: plus il y aura des utilisateurs de +Tor près de chez vous et leurs intérêts <a href="<page +about/torusers>">diversifiés,</a> et moins dangereux ça sera d'êtes l'un +d'entre-eux. +</li> +</ol> +<br> +<p> +Soyez intelligent et apprenez-en davantage. Comprenez ce que Tor peut et ce +qu'il ne peut pas offrir. Cette liste de pièges n'est pas exhaustive, et +nous avons besoin de votre aide <a href="<page +getinvolved/volunteer>#Documentation">pour identifier et documenter tous les +problèmes</a> . +</p> +</div> + + +</div> + + +<div id="sidecol-right"> +<div class="img-shadow"> +<div class="sidenav-sub"> +<h2>Aller à:</h2> +<ul> +<li class="dropdown"><a href="#Windows">Microsoft Windows</a></li> +<li class="dropdown"><a href="#mac">Apple OS X</a></li> +<li class="dropdown"><a href="#linux">Linux/Unix</a></li> +<li class="dropdown"><a href="#smartphones">Smartphones</a></li> +<li class="dropdown"><a href="#source">Code Source</a></li> +<li class="dropdown"><a href="<page donate/donate>">Faites un don</a></li> +</ul> +</div> +</div> + + +<div class="img-shadow"> +<div class="infoblock"> +<h2>Quel est le lien (sig)?</h2> +<p>Ce sont des signatures GPG pour vous permettre de vérifier que votre fichier +téléchargé est réellement du projet Tor et non un imposteur.</p> +<a href="<page docs/verifying-signatures>">En savoir plus »</a> +</div> +</div> + + +<div class="img-shadow"> +<div class="sidenav-sub"> +<h2>Vous rencontrez des problèmes?</h2> +<ul> +<li class="dropdown"><a href="<page docs/documentation>">Lisez les excellents manuels</a></li> +</ul> +</div> +</div> + + +</div> + + +</div> + + + +#include "foot.wmi" Added: website/trunk/fr/index.wml =================================================================== --- website/trunk/fr/index.wml (rev 0) +++ website/trunk/fr/index.wml 2011-05-06 13:53:39 UTC (rev 24724) @@ -0,0 +1,182 @@ + + + + + + +## translation metadata +# Revision: $Revision: 24425 $ +# Translation-Priority: 1-high +#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="home"> + <div id="content" class="clearfix"> + <div id="maincol"> + <div id="banner"> + <ul> + <li>Tor empêche quiconque de repérer votre localisation ou vos habitudes de +navigation</li> + <li>Tor est utile pour les navigateurs web, les clients de messagerie +instantanée, les connexions à distance, et encore plus</li> + <li>Tor est libre et open source pour Windows, Mac, GNU/Linux / Unix, et Android</li> + </ul> + <h1 class="headline">L'anonymat en ligne</h1> + <p class="desc">Protégez votre vie privée. Défendez-vous contre la surveillance du réseau et +l'analyse du trafic</p> + + <div id="download"> + <a href="<page download/download>"><span class="download-tor">Télécharger +Tor</span></a> + </div> + </div> + <div class="subcol-container clearfix"> + <div class="subcol first"> + <h2>Qu'est-ce que Tor ?</h2> <p>Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre +contre une forme de surveillance qui menace les libertés individuelles et la +vie privée, les activités et relations professionnelles confidentielles, et +la sécurité d'État connue sous le nom d'<a href="<page +about/overview>">analyse de trafic</a><br><span class="continue"><a +href="<page about/overview>">En savoir plus sur Tor »</a></span></p> + </div> + +  +<div class="subcol"> + <h2>Pourquoi l'anonymat est-il important</h2> + <p>Tor vous protège en faisant transiter vos communications au sein d'un réseau +distribué de relais hébergés par des volontaires partout dans le monde : il +empêche quiconque observant votre connexion Internet de savoir quels sites +vous visitez, et il empêche le site que vous visitez de savoir où vous vous +trouvez. Tor fonctionne avec bon nombre d'applications existantes, y compris +les navigateurs web, les clients de messagerie instantanée, les connexions à +distance, et autres applications basées sur le protocole TCP.<br><span +class="continue"><a href="<page getinvolved/volunteer>">Impliquez-vous dans +Tor »</a></span></p> </div> + </div> + +  +<div id="home-our-projects" class="clearfix"> + <h2>Nos projets</h2> + <div class="fauxhead"></div> + <table style="table-layout: fixed;"> + <tr> + <td> + <img src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"> + <h3><a href="<page torbutton/index>">Torbutton</a></h3> + <p>Torbutton est un moyen d'utiliser Tor en 1 clic pour les utilisateurs de +Firefox</p> + </td> + <td> + <img src="$(IMGROOT)/icon-TorCheck.jpg" alt="Tor Check Icon"> + <h3><a href="https://check.torproject.org/">Vérifier</a></h3> + <p>La vérification détermine si vous êtes protégé par Tor.</p> + </td> + </tr> + <tr> + <td> + <img src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon"> + <h3><a href="<page projects/vidalia>">Vidalia</a></h3> + <p>Vidalia est une interface graphique pour contrôler et afficher les +connexions Tor et ses paramètres.</p> + </td> + <td> + <img src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"> + <h3><a href="<page projects/torbrowser>">navigateur Tor</a></h3> + <p>Le Navigateur Tor contient tout ce dont vous avez besoin pour naviguer en +sûreté sur Internet </p> + </td> + </tr> + </table> + </div> + +  +</div> + + +  +<div id="sidecol"> + <div id="torusers"> + <h2>Qui utilise Tor?</h2> + <div class="user"> + <h3> + <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" +alt="Des gens normaux"> Famille & amis</a> + </h3> + <p>Les gens comme vous et les membres de votre famille utilisent Tor pour se +protéger eux, leur enfants et leur dignité, lorsqu'ils naviguent sur +Internet.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#executives"><img +src="$(IMGROOT)/consumers.jpg" alt="Entreprises"> Entreprises</a> + </h3> + <p>Les entreprises utilisent Tor pour rechercher de la concurrence, garder +leurs stratégies commerciales confidentielles, et faciliter la reddition de +leurs comptes internes.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#activists"><img +src="$(IMGROOT)/activists.jpg" alt="Les militants & dénonciateurs"> +Militants</a> + </h3> + <p>Les militants utilisent Tor pour rapporter les abus depuis des régions +dangereuses. Les dénonciateurs utilisent Tor pour informer en toute sécurité +des corruptions.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" +alt="Les journalistes et les médias">Media</a> + </h3> + <p>Les journalistes et médias utilisent Tor pour protéger leurs recherches et +sources en ligne.</p> + </div> + <div class="user"> + <h3> + <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" +alt="Militaires et application de la loi"> Militaires & application de +la loi</a> + </h3> + <p>Les militaires et applicateurs des lois utilisent Tor pour protéger leurs +communications, investigations, et la collecte d'informations en ligne.</p> + </div> + </div> + <div id="home-announcements" class="clearfix"> + <h2>Annonces</h2> + <div class="fauxhead"></div> + <table> + <tr> + <td> + <div class="calendar"><span class="month">Mars</span> <br> <span class="day">23</span></div> + <p>Le projet Tor remporte le prix du «Projet d'Intérêt Social», décerné par la +Free Software Foundation et le projet GNU. Nous sommes honorés de recevoir +ce prix et de rejoindre la liste des anciens lauréats. <a +href="https://blog.torproject.org/blog/tor-project-receives-fsf-award">Lire +la suite</a>.</p> + <div class="calendar"><span class="month">Février</span> <br> <span class="day">23</span></div> + <p>La dernière version stable de Tor, la 0.2.1.30, est <a +href="https://lists.torproject.org/pipermail/tor-announce/2011-February/000000.ht…">désormais +publiée</a>. Tor 0.2.1.30 corrige une variété de bogues de moindre +criticité. Le principal changement est une légère modification à la "poignée +de main" de Tor TLS qui fait que les relais et les ponts qui utilisent cette +nouvelle version peuvent être accédés à nouveau à partir de l'Iran. Nous ne +prévoyons pas que cette modification permette de gagner la course à long +terme, mais elle nous permet de gagner du temps jusqu'à ce que nous +déployions une meilleure solution. + </p> + </td> + </tr> + </table> + </div> + +  +</div> + +  +</div> + +  +</div> + + +#include "foot.wmi" Added: website/trunk/projects/it/sidenav.wmi =================================================================== --- website/trunk/projects/it/sidenav.wmi (rev 0) +++ website/trunk/projects/it/sidenav.wmi 2011-05-06 13:53:39 UTC (rev 24724) @@ -0,0 +1,55 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 24436 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /projects pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'projects/projects', + 'txt' => 'Software & Services', + 'subelements' => [ + {'url' => 'torbutton/index', + 'txt' => 'TorButton', + }, + {'url' => 'projects/torbrowser', + 'txt' => 'Tor Browser Bundle', + }, + {'url' => 'projects/vidalia', + 'txt' => 'Vidalia', + }, + {'url' => 'projects/arm', + 'txt' => 'Arm', + }, + {'url' => 'https://guardianproject.info/apps/orbot/', + 'txt' => 'Orbot', + }, + {'url' => 'https://tails.boum.org/', + 'txt' => 'Tails', + }, + {'url' => 'http://torstatus.blutmagie.de/', + 'txt' => 'TorStatus', + }, + {'url' => 'https://metrics.torproject.org/', + 'txt' => 'Metrics Portal', + } + ] + }]; +:> Added: website/trunk/projects/it/vidalia.wml =================================================================== --- website/trunk/projects/it/vidalia.wml (rev 0) +++ website/trunk/projects/it/vidalia.wml 2011-05-06 13:53:39 UTC (rev 24724) @@ -0,0 +1,164 @@ + + + + + +## translation metadata +# Revision: $Revision: 24618 $ +# Translation-Priority: 4-optional +#include "head.wmi" TITLE="Tor Project: Vidalia" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Pagina iniziale » </a> <a href="<page +projects/projects>">Progetti » </a> <a href="<page +projects/vidalia>">Vidalia » </a> + </div> + <div id="maincol"> + + +  +<h2>Vidalia</h2> + <div class="underline"></div> + + +  +<div class="sidebar-left"> + <img src="$(IMGROOT)/Screenshot-Vidalia-Control-Panel.png" width="261" +height="255" alt="Vidalia Control Panel Screenshot"/> + </div> + + +  +<p> + Vidalia è un controller grafico multipiattaforma per il software <a +href="<page index>">Tor</a> , costruito utilizzando il framework <a +href="http://qt.nokia.com/">Qt</a>. Vidalia si esegue sulla maggior parte +delle piattaforme supportate da Qt 4.3 o versioni successive, inclusi +Microsoft Windows, Apple OS X, Linux o altre varianti Unix che utilizzano il +sistema X11 per Windows. + </p> + <p> + Vidalia ti permette di avviare e terminare l'esecuzione di Tor, di +visualizzare la quantità di bandalarga che si sta consumando, di controllare +quanti circuiti sono attivi e dove sono connessi attraverso una mappa +mondiale; di visualizzare i messaggi di Tor relativi al suo progresso e al +suo stato corrente e di configurare client, bridge o relay con una semplice +interfaccia. In Vidalia è inoltre inclusa una guida completa che aiuta a +conoscere e utilizzare le opzioni disponibili per ogni utente. Tali +caratteristiche sono tradotte in diverse lingue. Vidalia non si esegue da +solo, per utilizzarlo è necessario il software Tor. (Tor non è incluso nei +download disponibili in questa pagina). + </p> + + <a id="Downloads"></a> + <h3><a class="anchor" href="#Downloads">Download</a></h3> + + <p> + La maggior parte degli utenti Windows e Mac OS X possono scaricare in +maniera semplice Vidalia come parte di un<a href="<page +download/download>">software Tor di aggregazione</a>. Se si vuole aggiornare +il software Vidalia incluso in un'aggregazione Tor già installata, è +possibile utilizzare uno dei seguenti pacchetti di installazione. + </p> + + <h4>Versioni stabili</h4> + <p> La versione stabile più recente è: 0.2.12</p> + <ul> + <li> + <a +href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12.exe">Windows +Installer</a> (<a +href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12.exe.asc">sig</a>) + </li> + <li> + <a +href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-i386.dmg">solo +Mac OS X x86 </a> (<a +href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-i386.dmg.asc">sig</a>) + </li> + <li> + <a +href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-ppc.dmg">solo +Mac OS X PPC</a> (<a +href="../dist/vidalia-bundles/vidalia-bundle-0.2.2.24-alpha-0.2.12-ppc.dmg.asc">sig</a>) + </li> + <li> + <a href="<page docs/debian-vidalia>">Istruzioni per archivi +Debian/Ubuntu/Knoppix</a> + </li> + <li> + <a href="../dist/vidalia/vidalia-0.2.12.tar.gz">Sorgente Tarball</a> (<a +href="../dist/vidalia/vidalia-0.2.12.tar.gz.sig">sig</a>) + </li> + </ul> + + + <a id="Contribute"></a> + <h3><a class="anchor" href="#Contribute">Contributo</a></h3> + + <p> + Vidalia è continuamente alla ricerca di volontari disponibili a contribuire +al suo sviluppo. Per cominciare è opportuno prima di tutto dare uno sguardo +alla pagina dei volontari <a +href="https://www.torproject.org/getinvolved/volunteer.html.en"> </a> e +verificare se esiste qualcosa di proprio interesse. Al momento, il codice +sorgente di Vidalia è presente in un archivio Git all'indirizzo +https://gitweb.torproject.org/vidalia. L' URL è +git://git.torproject.org/vidalia. Per poter collaborare con Vidalia è +consigliabile andare su questa pagina per vedere come è organizzata al suo +interno. Per far ciò è indispensabile la conoscenza di C++ e Qt. + </p> + + <a id="Support"></a> + <h3><a class="anchor" href="#Support">Supporto & Sviluppo</a></h3> + + <p> + Se si desidera già iniziare a effettuare codifiche, leggere e seguire la <a +href="https://gitweb.torproject.org/vidalia.git/blob/HEAD:/HACKING"> guida +MANOMISSIONI</a>. Se si è in possesso di una patch per una funzionalità o di +una correzione di un bug, controllare per prima cosa i <a +href="https://trac.torproject.org/projects/tor/report/27">tickets già +inviati</a>; se nessuno è adatto al proprio patch, selezionare un <a +href="https://trac.torproject.org/projects/tor/newticket">nuovo ticket</a> +indicando Vidalia come Componente. + </p> + + <p> + Se vengono trovati bug o si desidera una specifica funzionalità per le +versioni future di Vidalia, inviare un <a +href="https://trac.torproject.org/projects/tor/newticket"> nuovo ticket</a> +indicando Vidalia come Componente. + </p> + + <p> + Il metodo di comunicazione maggiormente utilizzato dai membri di progetto +all'interno di Tor è l'IRC (Internet Relay Chat). Al momento Vidalia è +sviluppata da Matt Edman e Tomas Touceda, rintracciabili nella OFTC (Open +and Free Technology Community) del canale #vidalia sotto i rispettivi +nickname edmann e chiiph. Sarebbe utile mettersi in contatto con loro per +conoscere a che cosa stanno lavorando e per condividere ciò a cui si sta +personalmente lavorando o si ha intenzione di lavorare. Se si ha l'intento +di aderire al team, è consigliato usare l'IRC nel canale di Vidalia o in +#tor-dev. + </p> + + <p> + Se si hanno dubbi riguardo qualsiasi punto trattato, inviare un'e-mail a <a +href="<page about/contact>">contatti</a>. + </p> + + </div> + +  +<div id = "sidecol"> + + + #include "side.wmi" +#include "info.wmi" +</div> + + +</div> + + +#include "foot.wmi" Added: website/trunk/torbutton/de/index.wml =================================================================== --- website/trunk/torbutton/de/index.wml (rev 0) +++ website/trunk/torbutton/de/index.wml 2011-05-06 13:53:39 UTC (rev 24724) @@ -0,0 +1,138 @@ + + + + + +## translation metadata +# Revision: $Revision: 23793 $ +# Translation-Priority: 3-low +#include "de/head.wmi" TITLE="Tor Project: Torbutton" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Startseite » </a> <a href="<page +torbutton/index>">Torbutton</a> + </div> + <div id="maincol"> + + +  +<link rel="search" type="application/opensearchdescription+xml" title="Google Kanada" href="search/google-ca.xml"/> + <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/> + <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/> + <script type="text/javascript"> + + function addSearchProvider(prov) { try { +window.external.AddSearchProvider(prov); } catch (e) { alert("Such-Plugins +benötigen Firefox 2"); return; } } function addEngine(name,ext,cat,pid) { +if ((typeof window.sidebar == "object") && (typeof +window.sidebar.addSearchEngine == "function")) { +window.sidebar.addSearchEngine( "http://mycroft.mozdev.org/install.php/" + +pid + "/" + name + ".src", "http://mycroft.mozdev.org/install.php/" + pid + +"/" + name + "."+ ext, name, cat ); } else { alert("Du benötigst einen +Browser der Sherlock unterstützt, um dieses Plugin zu installieren."); } } +function addOpenSearch(name,ext,cat,pid,meth) { if ((typeof window.external +== "object") && ((typeof window.external.AddSearchProvider == "unknown") || +(typeof window.external.AddSearchProvider == "function"))) { if ((typeof +window.external.AddSearchProvider == "unknown") && meth == "p") { +alert("Dieses Plugin benutzt POST, was im Momment noch nicht von der +Implemitierung von OpenSearch im Internet Explorer unterstützt ist."); } +else { window.external.AddSearchProvider( +"http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml"); } } +else { alert("Du benötigst einen Browser der OpenSearch unterstützt um +dieses Plugin installieren zu können."); } } function +addOpenSearch2(name,ext,cat,pid,meth) { if ((typeof window.external == +"object") && ((typeof window.external.AddSearchProvider == "unknown") || +(typeof window.external.AddSearchProvider == "function"))) { if ((typeof +window.external.AddSearchProvider == "unknown") && meth == "p") { +alert("Dieses Plugin benutzt POST, was im Momment noch nicht von der +Implemitierung von OpenSearch im Internet Explorer unterstützt ist."); } +else { window.external.AddSearchProvider( +"http://torbutton.torproject.org/dev/search/" + name + ".xml"); } } else { +alert("Du benötigst einen Browser der OpenSearch unterstützt um dieses +Plugin installieren zu können."); } } function install (aEvent) { var +params = { "Torbutton": { URL: aEvent.target.href, Hash: +aEvent.target.getAttribute("hash"), toString: function () { return this.URL; +} } }; InstallTrigger.install(params); return false; } + + + </script> + + <h2>Torbutton</h2> + <hr> <strong>Neueste stabile Version:</strong><version-torbutton><br/> +<strong>Neueste Alpha Version:</strong><version-torbutton-alpha><br/> <br/> +<strong>Authoren:</strong> Mike Perry & Scott Squires<br/> <br/> +<strong>Installation Stabile Version:</strong> Klick auf <a +href="https://www.torproject.org/dist/torbutton/torbutton-current.xpi" +hash="<version-hash-torbutton>" onclick="return install(event);">Installiere +von dieser Webseite</a> oder <a +href="https://addons.mozilla.org/en-US/firefox/downloads/latest/2275/addon-2275-l…">Installiere +von Mozilla's Add-On Seite</a><br/> <strong>Installation Alpha +Version:</strong> Klick auf <a +href="https://www.torproject.org/dist/torbutton/torbutton-current-alpha.xpi" +hash="<version-hash-torbutton-alpha>" onclick="return +install(event);">Installiere von dieser Seite</a> <br/> <strong>Englishe +Google-Suche:</strong> Google-Suche nach Plugins für <a href="/jsreq.html" +title="Ref: 14938 (googleCA)" +onClick="addOpenSearch('GoogleCanada','ico','General','14937','g');return +false">Google CA</a>, und <a href="/jsreq.html" title="Ref: 14938 +(googleCA)" +onClick="addOpenSearch('googleuk_web','png','General','14445','g');return +false">Google UK</a>. <br/> <strong>Alte Versionen:</strong> <a +href="../dist/torbutton/">Lokal</a><br/> <br/> <strong>Entwickler +Dokumentation:</strong> <a href="en/design/index.html.en">Torbutton +Design-Dokument</a> und <a href="en/design/MozillaBrownBag.pdf">Slides (Wird +nicht oft aktualisiert)</a><br/> <strong>Source:</strong> Du kannst <a +href="https://gitweb.torproject.org/torbutton.git">das repository +durchsuchen</a> oder einfach die xpi entpacken. <br/> +<strong>Fehlerberichte:</strong> <a +href="https://trac.torproject.org/projects/tor/report/14">Torproject +Bug-Tracker</a><br/> <strong>Documents:</strong> <b>[</b> <a href="<page +torbutton/torbutton-faq>">FAQ</a> <b>|</b> <a +href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CHANGELOG">Changelog</a> +<b>|</b> <a +href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/LICENSE">Lizens</a> +<b>|</b> <a +href="https://gitweb.torproject.org/torbutton.git/blob/HEAD:/src/CREDITS">Credits</a> +<b>]</b><br/> <br/> + + <p> + Der Torbutton ist eine 1-klick für Firefox Benutzer die Benutzung von <a +href="<page index>">Tor</a> Ein- und Auszuschalten. Es fügt ein Panel zur +Statusleiste hinzu, dass entweder "Tor Eingeschaltet" (in Grün) oder "Tor +Ausgeschaltet" (in Rot) anzeigt. Durch einen Klick auf das Panel, kann man +Tor Ein- oder Ausschalten. Wenn der Benutzer (oder eine andere Erweiterung) +die Proxyeinstellungen ändert, wird diese Änderung automatisch in der +Statusleiste angezeigt. + </p> + + <p> + Um dich zu schützen deaktiviert Torbutton viele Typen von Aktivem Inhalt. Du +kannst im <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a> mehr +erfahren, oder dir mehr Details in der <a href="<page +torbutton/torbutton-options>">Torbutton Optionenliste</a> ansehen. + </p> + + <p> + Einige User bevorzugen einen Knopf in der Add-On-Leiste anstelle der +Statusleite. Torbutton lässt dich einen Add-On-Leisten Knopf erstellen, +indem du auf die gewünschte Leiste Rechstklickst, und "Anpassen..." +auswählst und dann das Torbutton Symbol auf die Add-On-Leiste ziehst. Es +gibt eine Einstellung in den Optionen, mit der man das Statusleiten Panel +ausblenden kann (Extras->Add-Ons, wähle Torbutton, und klick auf +Einstellungen). + </p> + </div> + +  +<div id = "sidecol"> + + +#include "de/side.wmi" +#include "de/info.wmi" +</div> + + +</div> + + +#include "de/foot.wmi"

1 0