- tor-commits - lists.torproject.org

[arm/master] Format option for getstr method
by atagar＠torproject.org 25 Jun '11

25 Jun '11

commit 9ffda70c2203630b41a9f799e754f7f55e70e9b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 08:51:20 2011 -0700 Format option for getstr method Allowing string input fetching to have text attributes. --- src/util/panel.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 3f0a98a..5cbeaee 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -573,7 +573,7 @@ class Panel(): baseMsg = "Unclosed formatting tag%s:" % ("s" if len(expectedCloseTags) > 1 else "") raise ValueError("%s: '%s'\n \"%s\"" % (baseMsg, "', '".join(expectedCloseTags), msg)) - def getstr(self, y, x, initialText = ""): + def getstr(self, y, x, initialText = "", format = None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then @@ -584,8 +584,11 @@ class Panel(): y - vertical location x - horizontal location initialText - starting text in this field + format - format used for the text """ + if not format: format = curses.A_NORMAL + # makes cursor visible try: previousCursorState = curses.curs_set(1) except curses.error: previousCursorState = 0 @@ -595,7 +598,8 @@ class Panel(): inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) # prepopulates the initial text - if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1]) + if initialText: + inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1], format) # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses @@ -609,7 +613,9 @@ class Panel(): else: textbox = curses.textpad.Textbox(inputSubwindow) + textbox.win.attron(format) userInput = textbox.edit(lambda key: _textboxValidate(textbox, key)).strip() + textbox.win.attroff(format) if textbox.lastcmd == curses.ascii.BEL: userInput = None # reverts visability settings

1 0

[arm/master] Relay options page for the setup wizard
by atagar＠torproject.org 25 Jun '11

25 Jun '11

commit 2449cb349a24ab23872f415d0f192b25996f8588 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 24 20:05:25 2011 -0700 Relay options page for the setup wizard This has the display and navigation logic for the relay settings page of the wizard. The only bit missing is input validation of the text field inputs (for instance, checking that a bandwidth value will be recognized), but otherwise this part of the wizard is pretty much done. --- src/cli/wizard.py | 242 ++++++++++++++++++++++++++++++++++++++++++++--------- src/settings.cfg | 47 ++++++++--- 2 files changed, 237 insertions(+), 52 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index f9dd770..a3404b9 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -1,6 +1,6 @@ """ Provides user prompts for setting up a new relay. This autogenerates a torrc -that's used by arm to start its tor instance. +that's used by arm to run its own tor instance. """ import curses @@ -13,23 +13,124 @@ from util import enum, uiTools # basic configuration types we can run as RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +# all options that can be configured +Options = enum.Enum("NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "STARTUP") +RelayOptions = (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.STARTUP) + # other options provided in the prompts -CANCEL, BACK = "Cancel", "Back" +CANCEL, NEXT, BACK = "Cancel", "Next", "Back" + +MSG_COLOR = "green" +OPTION_COLOR = "yellow" -CONFIG = {"wizard.role.message": "", - "wizard.role.option.label": {}, - "wizard.role.option.description": {}} +CONFIG = {"wizard.message.role": "", + "wizard.message.relay": "", + "wizard.toggle": {}, + "wizard.default": {}, + "wizard.label.general": {}, + "wizard.label.role": {}, + "wizard.label.opt": {}, + "wizard.description.general": {}, + "wizard.description.role": {}, + "wizard.description.opt": {}} def loadConfig(config): config.update(CONFIG) +class ConfigOption: + """ + Attributes of a configuraition option. + """ + + def __init__(self, key, group, default): + """ + Configuration option constructor. + + Arguments: + key - configuration option identifier used when querying attributes + group - configuration attribute group this belongs to + default - initial value, uses the config default if unset + """ + + self.key = key + self.group = group + self.descriptionCache = None + self.descriptionCacheArg = None + self.value = default + + def getKey(self): + return self.key + + def getValue(self): + return self.value + + def getDisplayValue(self): + return self.value + + def setValue(self, value): + self.value = value + + def getLabel(self, prefix = ""): + return prefix + CONFIG["wizard.label.%s" % self.group].get(self.key, "") + + def getDescription(self, width, prefix = ""): + if not self.descriptionCache or self.descriptionCacheArg != width: + optDescription = CONFIG["wizard.description.%s" % self.group].get(self.key, "") + self.descriptionCache = _splitStr(optDescription, width) + self.descriptionCacheArg = width + + return [prefix + line for line in self.descriptionCache] + +class ToggleConfigOption(ConfigOption): + def __init__(self, key, group, default, trueLabel, falseLabel): + ConfigOption.__init__(self, key, group, default) + self.trueLabel = trueLabel + self.falseLabel = falseLabel + + def getDisplayValue(self): + return self.trueLabel if self.value else self.falseLabel + + def toggle(self): + self.value = not self.value + def showWizard(): - myRelayType = promptRelayType() + relayType, config = None, {} + + for option in Options.values(): + toggleValues = CONFIG["wizard.toggle"].get(option) + default = CONFIG["wizard.default"].get(option, "") + + if toggleValues: + if "," in toggleValues: + trueLabel, falseLabel = toggleValues.split(",", 1) + else: trueLabel, falseLabel = toggleValues, "" + + isSet = default.lower() == "true" + config[option] = ToggleConfigOption(option, "opt", isSet, trueLabel.strip(), falseLabel.strip()) + else: config[option] = ConfigOption(option, "opt", default) + + while True: + if relayType == None: + selection = promptRelayType() + + if selection == CANCEL: break + else: relayType = selection + else: + if relayType == RelayType.RELAY: + selection = promptRelayOptions(config) + + if selection == BACK: relayType = None + elif selection == NEXT: break # TODO: implement next screen + else: + break # TODO: other catagories not yet implemented + + # redraws screen to clear away the dialog we just showed + cli.controller.getController().requestRedraw(True) def promptRelayType(): """ Provides a prompt for selecting the general role we'd like Tor to run with. - This returns a RelayType enumeration for the selection, or None if the + This returns a RelayType enumeration for the selection, or CANCEL if the dialog was canceled. """ @@ -37,66 +138,127 @@ def promptRelayType(): if not popup: return control = cli.controller.getController() key, selection = 0, 0 - - # constructs (enum, label, [description lines]) tuples for our options - options = [] - - for runType in RelayType.values() + [CANCEL]: - label = CONFIG["wizard.role.option.label"].get(runType, "") - descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") - descLines = [] - - while descRemainder: - descLine, descRemainder = uiTools.cropStr(descRemainder, 52, None, endType = None, getRemainder = True) - descLines.append(descLine.strip()) - - options.append((runType, label, descLines)) + options = [ConfigOption(opt, "role", opt) for opt in RelayType.values()] + options.append(ConfigOption(CANCEL, "general", CANCEL)) try: popup.win.box() curses.cbreak() - format = uiTools.getColor("green") - y, msgRemainder = 1, CONFIG["wizard.role.message"] # provides the welcoming message - while msgRemainder: - msg, msgRemainder = uiTools.cropStr(msgRemainder, 54, None, endType = None, getRemainder = True) - popup.addstr(y, 2, msg.strip(), format | curses.A_BOLD) - y += 1 + topContent = _splitStr(CONFIG["wizard.message.role"], 54) + for i in range(len(topContent)): + popup.addstr(i + 1, 2, topContent[i], curses.A_BOLD | uiTools.getColor(MSG_COLOR)) - while not uiTools.isSelectionKey(key): - offset = 0 + while True: + y, offset = len(topContent) + 1, 0 for i in range(len(options)): - _, label, lines = options[i] - optionFormat = format | curses.A_STANDOUT if i == selection else format - - # appends an extra space to the start to provide nicer centering - label = " " + label - lines = [" " + line for line in lines] + optionFormat = uiTools.getColor(MSG_COLOR) + if i == selection: optionFormat |= curses.A_STANDOUT # Curses has a weird bug where there's a one-pixel alignment # difference between bold and regular text, so it looks better # to render the whitespace here as not being bold. offset += 1 + label = options[i].getLabel(" ") popup.addstr(y + offset, 2, label, optionFormat | curses.A_BOLD) popup.addstr(y + offset, 2 + len(label), " " * (54 - len(label)), optionFormat) offset += 1 - for line in lines: + for line in options[i].getDescription(52, " "): popup.addstr(y + offset, 2, uiTools.padStr(line, 54), optionFormat) offset += 1 popup.win.refresh() key = control.getScreen().getch() - if key == curses.KEY_UP: selection = max(0, selection - 1) - elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) + if key == curses.KEY_UP: selection = (selection - 1) % len(options) + elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) + elif uiTools.isSelectionKey(key): return options[selection].getValue() + elif key == 27: return CANCEL # esc - cancel + finally: + cli.popups.finalize() + +def promptRelayOptions(config): + """ + Prompts the user for the configuration of an internal relay. + """ + + popup, _, _ = cli.popups.init(23, 58) + if not popup: return + control = cli.controller.getController() + options = [config[opt] for opt in RelayOptions] + options.append(ConfigOption(BACK, "general", "(to role selection)")) + options.append(ConfigOption(NEXT, "general", "(to confirm options)")) + key, selection = 0, 0 + + try: + curses.cbreak() + + while True: + popup.win.erase() + popup.win.box() + + # provides the description for internal relays + topContent = _splitStr(CONFIG["wizard.message.relay"], 54) + for i in range(len(topContent)): + popup.addstr(i + 1, 2, topContent[i], curses.A_BOLD | uiTools.getColor(MSG_COLOR)) + + y, offset = len(topContent) + 1, 0 + for i in range(len(options)): + label = " %-30s%s" % (options[i].getLabel(), options[i].getDisplayValue()) + optionFormat = curses.A_BOLD | uiTools.getColor(OPTION_COLOR) + if i == selection: optionFormat |= curses.A_STANDOUT + + offset += 1 + popup.addstr(y + offset, 2, uiTools.padStr(label, 54), optionFormat) + + # extra space to divide options/navigation + if i == len(options) - 3: offset += 1 + + # divider between the options and description + offset += 2 + popup.addch(y + offset, 0, curses.ACS_LTEE) + popup.addch(y + offset, popup.getWidth() - 1, curses.ACS_RTEE) + popup.hline(y + offset, 1, popup.getWidth() - 2) + + # description for the currently selected option + for line in options[selection].getDescription(54, " "): + offset += 1 + popup.addstr(y + offset, 1, line, uiTools.getColor(MSG_COLOR)) + + popup.win.refresh() + key = control.getScreen().getch() + + if key == curses.KEY_UP: selection = (selection - 1) % len(options) + elif key == curses.KEY_DOWN: selection = (selection + 1) % len(options) + elif uiTools.isSelectionKey(key): + if selection == len(options) - 2: return BACK # selected back + elif selection == len(options) - 1: return NEXT # selected next + elif isinstance(options[selection], ToggleConfigOption): + options[selection].toggle() + else: + newValue = popup.getstr(y + selection + 1, 33, options[selection].getValue(), curses.A_STANDOUT | uiTools.getColor(OPTION_COLOR), 23) + if newValue: options[selection].setValue(newValue.strip()) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: cli.popups.finalize() + +def _splitStr(msg, width): + """ + Splits a string into substrings of a given length. + + Arguments: + msg - string to be broken up + width - max length of any returned substring + """ + + results = [] + while msg: + msgSegment, msg = uiTools.cropStr(msg, width, None, endType = None, getRemainder = True) + results.append(msgSegment.strip()) - selectedOption = options[selection][0] - return None if selectedOption == CANCEL else selectedOption + return results diff --git a/src/settings.cfg b/src/settings.cfg index 2ad2784..94ff9c1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -340,20 +340,43 @@ msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps -# descriptions used in the relay setup wizard -wizard.role.message Welcome to the Tor network! This will step you through the configuration process for being a part of it. To start with, what role would you like to have? +# configuration option attributes used in the relay setup wizard +wizard.message.role Welcome to the Tor network! This will step you through the configuration process for becoming a part of it. To start with, what role would you like to have? +wizard.message.relay Internal relays provide connections within the Tor network. Since you will only be connecting to Tor users and relays this is an easy, hassle free way of helping to make the network better. -wizard.role.option.label Relay => Internal Relay -wizard.role.option.label Exit => Exit Relay -wizard.role.option.label Bridge => Bridge -wizard.role.option.label Client => Client -wizard.role.option.label Cancel => Cancel +wizard.toggle Notify => Yes, No +wizard.toggle Startup => Yes, No -wizard.role.option.description Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. -wizard.role.option.description Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. -wizard.role.option.description Bridge => Non-public relay specifically for helping censored users. -wizard.role.option.description Client => Use the network without contributing to it. -wizard.role.option.description Cancel => Close without starting Tor. +wizard.default Nickname => Unnamed +wizard.default Notify => true +wizard.default Bandwidth => 5 MB/s +wizard.default Startup => true + +wizard.label.general Cancel => Cancel +wizard.label.general Back => Previous +wizard.label.general Next => Next +wizard.label.role Relay => Internal Relay +wizard.label.role Exit => Exit Relay +wizard.label.role Bridge => Bridge +wizard.label.role Client => Client +wizard.label.opt Nickname => Nickname +wizard.label.opt Contact => Contact Information +wizard.label.opt Notify => Issue Notification +wizard.label.opt Bandwidth => Relay Speed +wizard.label.opt Limit => Monthly Limit +wizard.label.opt Startup => Run At Startup + +wizard.description.general Cancel => Close without starting Tor. +wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.description.role Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. +wizard.description.role Bridge => Non-public relay specifically for helping censored users. +wizard.description.role Client => Use the network without contributing to it. +wizard.description.opt Nickname => Human friendly name for your relay. If this is unique then it's used instead of your fingerprint (a forty character hex string) when pages like TorStatus refer to you. +wizard.description.opt Contact => Address we can contact you at if there's a problem with your relay. This is public information so, if it looks like an email address, we'll obscure it a bit. +wizard.description.opt Notify => Sends automated email notifications to the above address if your relay is unreachable or out of date. This service is provided by Tor Weather (https://weather.torproject.org/) and will send you a confirmation email before it's started. +wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic. +wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit. +wizard.description.opt Startup => Runs Tor in the background when the system starts. # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions

1 0

[arm/master] fix: clearing content in a getstr input field
by atagar＠torproject.org 25 Jun '11

25 Jun '11

commit 6fa3123d8ad9c669db3079d144f7de5117eabd2b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 09:03:31 2011 -0700 fix: clearing content in a getstr input field Any stray characters within the textbox is interpreted as part of the initial input. Clearing the input field when we make it and giving an option for limiting its size. --- src/util/panel.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 5cbeaee..59d2b13 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -573,18 +573,23 @@ class Panel(): baseMsg = "Unclosed formatting tag%s:" % ("s" if len(expectedCloseTags) > 1 else "") raise ValueError("%s: '%s'\n \"%s\"" % (baseMsg, "', '".join(expectedCloseTags), msg)) - def getstr(self, y, x, initialText = "", format = None): + def getstr(self, y, x, initialText = "", format = None, maxWidth = None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then this terminates and provides back None. This should only be called from the context of a panel's draw method. + This blanks any content within the space that the input field is rendered + (otherwise stray characters would be interpreted as part of the initial + input). + Arguments: y - vertical location x - horizontal location initialText - starting text in this field format - format used for the text + maxWidth - maximum width for the text field """ if not format: format = curses.A_NORMAL @@ -595,8 +600,13 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] + if maxWidth: displayWidth = min(displayWidth, maxWidth + x) inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) + # blanks the field's area, filling it with the font in case it's hilighting + inputSubwindow.clear() + inputSubwindow.bkgd(' ', format) + # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1], format)

1 0

r24839: {} add my presentation from the allied media conference today. (in projects/presentations: . images)
by Andrew Lewman 25 Jun '11

25 Jun '11

Author: phobos Date: 2011-06-25 03:01:12 +0000 (Sat, 25 Jun 2011) New Revision: 24839 Added: projects/presentations/2011-06-24-AlliedMediaconf.pdf projects/presentations/2011-06-24-AlliedMediaconf.tex projects/presentations/images/1984first.jpg projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn-crop.png projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn.png projects/presentations/images/2011-06-23-cnet-us-internet-censorship-voluntary.png projects/presentations/images/IPRC_Seized_2010_11.jpg projects/presentations/images/cropped-saudi-arabia-filter-message.png projects/presentations/images/innocent_or_not_history_judges.jpg Log: add my presentation from the allied media conference today. Added: projects/presentations/2011-06-24-AlliedMediaconf.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2011-06-24-AlliedMediaconf.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2011-06-24-AlliedMediaconf.tex =================================================================== --- projects/presentations/2011-06-24-AlliedMediaconf.tex (rev 0) +++ projects/presentations/2011-06-24-AlliedMediaconf.tex 2011-06-25 03:01:12 UTC (rev 24839) @@ -0,0 +1,138 @@ +\documentclass{beamer} +\mode<presentation> +%\usetheme{Boadilla} +\beamertemplatenavigationsymbolsempty +\title{Allied Media Conference} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{24 June 2011} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/1984first} + \par + \end{centering} +\end{frame} + +%\begin{frame} +%\frametitle{George Orwell was an optimist} +%\includegraphics[scale=0.3]{./images/1984first} +%\end{center} +%\end{frame} + +\begin{frame} +\frametitle{George Orwell was an optimist} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad Who controls the past, controls the future: who controls the present controls the past +\end{quotation} +\flushright --- George Orwell, Nineteen Eighty Four, 1949 +\end{frame} + +\begin{frame} +\frametitle{Internet Censorship Is Everywhere} +\includegraphics<1>[scale=0.5]{./images/youdontquestionme-inet-censorship-map-with-key} +\includegraphics<2>[scale=0.5]{./images/cropped-saudi-arabia-filter-message} +\includegraphics<3>[scale=0.5]{./security-part2-anon/jingjing} +\includegraphics<3>[scale=0.5]{./security-part2-anon/chacha} +\includegraphics<4>[scale=0.3]{./images/IPRC_Seized_2010_11} +\end{frame} + +\begin{frame} +\frametitle{Censoring the 'net is all the rage} +\begin{center} +\includegraphics[scale=.7]{./images/2011-06-08-china-net-censorship-piracy-porn-crop} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Censoring the 'net is all the rage} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad more than 700 pornographic and copyright infringing websites have been shut down +\end{quotation} +\end{frame} + +\begin{frame} +\frametitle{Censoring the 'net is all the rage} +\begin{center} +\includegraphics[scale=0.6]{./images/2011-06-23-cnet-us-internet-censorship-voluntary} +\end{center} +\end{frame} +\setbeamercolor{sidebar}{bg=black} +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/images_pic-large-27489-In_the_future} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{Internet Surveillance is getting more advanced} +\begin{center} +\includegraphics<1>[scale=0.5]{./images/procera-evolved-dpi} +\includegraphics<2>[scale=0.5]{./images/iran-ssl-dpi-26-seconds-to-death} +\includegraphics<3>[scale=0.6]{./images/2011-infoweek-comodo-hacker} +\includegraphics<4>[scale=0.6]{./images/al-jazeera-egypt-crackdown-US-co-ties} +\includegraphics<5>[scale=0.5]{./images/nsa-room} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/paco-primera-pagina-oleo-lienzo-110-x-150-cms-2008-red} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{The Tor Project, Inc.} +\begin{Large} +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy +\end{Large} +\begin{center} +\includegraphics[height=5cm]{./images/2009-oval_sticker_new} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Tor hides communication patterns by relaying data through volunteer servers} +\begin{center} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[width=9cm]{./images/tor-network}} +\only<2>{\includegraphics[width=9cm]{./images/tor-safe-selection}} +\only<3>{\includegraphics[width=9cm]{./images/tor-safe-path}} +\only<4>{\includegraphics[width=9cm]{./images/tor-keys1}} +\end{overlayarea} +\flushright +\tiny Diagram: Robert Watson +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Thanks!} +\begin{LARGE} +Visit \url{https://www.torproject.org/} for more information, links, and ideas. +\end{LARGE} +\end{frame} + +\begin{frame} +\frametitle{Copyright \& Sources} +\begin{itemize} +\begin{small} +\item Internet censorship is everywhere, first image: Reporters without Borders, http://www.rsf.org +\item censoring the 'net is all the rage, http://thenextweb.com/asia/2011/06/08/china-increases-internet-control-take… +\item censoring the 'net is all the rage, http://news.cnet.com/8301-31001\_3-20073522-261/exclusive-top-isps-poised-t… +\item Internet surveillance, second image: http://www.informationweek.com/news/security/attacks/229400850 +\item Internet surveillance, third image: Al Jazeera, February 2011 +\item spring is in the air, Paco Pomet, http://pacopomet.wordpress.com/ +\end{small} +\end{itemize} +\end{frame} + +\end{document} Property changes on: projects/presentations/2011-06-24-AlliedMediaconf.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/1984first.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/1984first.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn-crop.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn-crop.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-06-08-china-net-censorship-piracy-porn.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/2011-06-23-cnet-us-internet-censorship-voluntary.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/2011-06-23-cnet-us-internet-censorship-voluntary.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/IPRC_Seized_2010_11.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/IPRC_Seized_2010_11.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/cropped-saudi-arabia-filter-message.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/cropped-saudi-arabia-filter-message.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/innocent_or_not_history_judges.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/innocent_or_not_history_judges.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

[torbutton/master] Bug 3446: We're Firefox 5.0, we swear.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit b834e541cf975eeaa291a374b4b95222b36eebd6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 15:39:17 2011 -0700 Bug 3446: We're Firefox 5.0, we swear. --- src/defaults/preferences/preferences.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 10538e0..353ee32 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -205,7 +205,7 @@ pref("extensions.torbutton.appversion_override","5.0 (Windows)"); pref("extensions.torbutton.platform_override","Win32"); pref("extensions.torbutton.oscpu_override", "Windows NT 6.1"); -pref("extensions.torbutton.useragent_override", "Mozilla/5.0 (Windows NT 6.1; rv:2.0) Gecko/20100101 Firefox/4.0"); +pref("extensions.torbutton.useragent_override", "Mozilla/5.0 (Windows NT 6.1; rv:5.0) Gecko/20100101 Firefox/5.0"); pref("extensions.torbutton.productsub_override","20100101"); pref("extensions.torbutton.buildID_override","0");

1 0

[torbutton/master] Make DuckDuckGo the default Google Captcha redirect destination.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 63e6eeeea1ed61fc0e14f7abd0d8bde9778a5733 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 15:40:00 2011 -0700 Make DuckDuckGo the default Google Captcha redirect destination. The search results seem slightly better than ixquick, and the interface is a lot slicker. Plus, who wouldn't trust a duck with a bow-tie? He just wants to help you so bad. --- src/chrome/content/preferences.xul | 4 ++-- src/defaults/preferences/preferences.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index b4eb3d0..1795fc1 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -359,10 +359,10 @@ oncommand="torbutton_prefs_set_field_attributes(document)"/> <hbox class="indent" align="center"> <radiogroup align="center" orient="horizontal" id="torbutton_searchEngine"> - <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine5" label="&torbutton.prefs.engine5;" oncommand="torbutton_prefs_set_field_attributes(document)"/> + <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;" + oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine2" label="&torbutton.prefs.engine2;" oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine3" label="&torbutton.prefs.engine3;" diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 353ee32..6c874b6 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -189,7 +189,7 @@ pref("extensions.torbutton.regen_google_cookies", false); pref("extensions.torbutton.xfer_google_cookies", true); // Google redirect prefs -pref("extensions.torbutton.google_redir_url", 1); +pref("extensions.torbutton.google_redir_url", 5); pref("extensions.torbutton.dodge_google_captcha", true); pref("extensions.torbutton.asked_google_captcha", false); pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query=");

1 0

[torbutton/master] Fix a transparent context menu issue on Linux FF4+.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 505f51d2158720509428c1b24686723c49beb0f7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 16:12:59 2011 -0700 Fix a transparent context menu issue on Linux FF4+. --- src/chrome/content/popup.xul | 4 ++-- src/chrome/content/torbutton.xul | 2 +- src/chrome/content/torbutton_tb.xul | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 03f55f8..f96b821 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -9,7 +9,7 @@ <stringbundleset id="torbutton-stringbundleset"> <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> </stringbundleset> - <popup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();"> + <menupopup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();"> <menuitem id="torbutton-toggle" label="&torbutton.context_menu.toggle;" accesskey="&torbutton.context_menu.toggle.key;" @@ -31,6 +31,6 @@ accesskey="&torbutton.context_menu.about.key;" insertafter="context-stop" oncommand="torbutton_open_about_dialog()"/> - </popup> + </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 428d4da..f600f89 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -20,7 +20,7 @@  <toolbar id="nav-bar"> - <popup id="torbutton-context-menu"/> + <menupopup id="torbutton-context-menu"/> </toolbar> <toolbarpalette id="BrowserToolbarPalette"> diff --git a/src/chrome/content/torbutton_tb.xul b/src/chrome/content/torbutton_tb.xul index 41f2d58..5142b2e 100644 --- a/src/chrome/content/torbutton_tb.xul +++ b/src/chrome/content/torbutton_tb.xul @@ -52,6 +52,6 @@ context="torbutton-context-menu" onclick="if (event.button == 0) torbutton_toggle(false)"/> - <popup id="torbutton-context-menu"/> + <menupopup id="torbutton-context-menu"/> </statusbar> </overlay>

1 0

[tor/master] explain that the ./publish should happen soon after the scp
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit b181985a8f98c0ba15230912f059e1fcf7c626f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 21 00:37:18 2011 -0400 explain that the ./publish should happen soon after the scp otherwise you scp a tarball up but only one version of the website has it. --- doc/HACKING | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 7ff9c5f..feeb05d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -456,7 +456,6 @@ interesting and understandable. 2.7) Run it through fmt to make it pretty. - 3) Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's a stable release, add it to the ReleaseNotes file too. If we're adding @@ -472,15 +471,19 @@ or somebody to try building it on Windows. 6) Get at least two of weasel/arma/karsten to put the new version number in their approved versions list. -7) Sign and push the tarball to the website in the dist/ directory. Sign -and push the git tag. - (That's either "git tag -u <keyid> tor-0.2.x.y-status", then - "git push origin tag tor-0.2.x.y-status". To sign the - tarball, "gpg -ba <the_tarball>". Put the files in - /srv/www-master.torproject.org/htdocs/dist/ on vescum.) +7) Sign the tarball, then sign and push the git tag: + gpg -ba <the_tarball> + git tag -u <keyid> tor-0.2.x.y-status + git push origin tag tor-0.2.x.y-status + +8) scp the tarball and its sig to the website in the dist/ directory +(i.e. /srv/www-master.torproject.org/htdocs/dist/ on vescum). Edit +include/versions.wmi to note the new version. From your website checkout, +run ./publish to build and publish the website. -8) Edit include/versions.wmi to note the new version. From your website -checkout, run ./publish to build and publish the website. +Try not to delay too much between scp'ing the tarball and running +./publish -- the website has multiple A records and your scp only sent +it to one of them. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers. @@ -498,3 +501,4 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +

1 0

[tor/master] Fix minor comment issues
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit d7254bea11a0fc2685cc2ea24fb57d2ab3945b2f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:28:40 2011 -0700 Fix minor comment issues --- src/common/compat.c | 2 +- src/or/connection.c | 6 +++--- src/or/or.h | 6 +++--- src/test/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 9377959..c983925 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -415,7 +415,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) * * This function is not timing-safe. * - * Requires that nlen be greater than zero. + * Requires that nlen be greater than zero. */ const void * tor_memmem(const void *_haystack, size_t hlen, diff --git a/src/or/connection.c b/src/or/connection.c index a9e3a74..b2412a2 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2751,15 +2751,15 @@ connection_outbuf_too_full(connection_t *conn) return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); } -/** Try to flush more bytes onto conn-\>s. +/** Try to flush more bytes onto conn-\>s. * * This function gets called either from conn_write() in main.c * when poll() has declared that conn wants to write, or below * from connection_write_to_buf() when an entire TLS record is ready. * - * Update conn-\>timestamp_lastwritten to now, and call flush_buf + * Update conn-\>timestamp_lastwritten to now, and call flush_buf * or flush_buf_tls appropriately. If it succeeds and there are no more - * more bytes on conn->outbuf, then call connection_finished_flushing + * more bytes on conn-\>outbuf, then call connection_finished_flushing * on it too. * * If force, then write as many bytes as possible, ignoring bandwidth diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..1909887 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2318,14 +2318,14 @@ typedef struct or_circuit_t { cell_ewma_t p_cell_ewma; } or_circuit_t; -/** Convert a circuit subtype to a circuit_t.*/ +/** Convert a circuit subtype to a circuit_t. */ #define TO_CIRCUIT(x) (&((x)->_base)) -/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Asserts +/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ static or_circuit_t *TO_OR_CIRCUIT(circuit_t *); /** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t. - * Asserts if the cast is impossible. */ + * Assert if the cast is impossible. */ static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 546fa2f..904719d 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -I"$(top_srcdir)/src/or" # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. -# This seems to matter nowhere but on windows, but I assure you that it +# 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. test_SOURCES = \

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 8a55da57ed17dfb9cefe3193cbda53a15547630e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:25:51 2011 -0700 Fix comment typo --- src/test/tinytest_demo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index bd33cc3..4d2f588 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -39,7 +39,7 @@ /* ============================================================ */ /* First, let's see if strcmp is working. (All your test cases should be - * functions declared to take a single void * as) an argument. */ + * functions declared to take a single void * as an argument.) */ void test_strcmp(void *data) {

1 0