- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix comment typo
by nickm＠torproject.org 22 Jun '11

22 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

[arm/master] Relay setup wizard role selection
by atagar＠torproject.org 21 Jun '11

21 Jun '11

commit 5eb2155266cf4d50af23a9c0cd06d5ab05db9553 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 21 20:14:09 2011 -0700 Relay setup wizard role selection This provides the first prompt of the relay setup wizard which has options for the general role Tor will have. Options include: - Internal Realy - Exit Relay - Bridge - Client - Cancel Selection is currenty a no-op. Next thing to do are the sub-dialogs these options go to... --- README | 1 + src/cli/__init__.py | 2 +- src/cli/controller.py | 7 +++- src/cli/menu/actions.py | 2 + src/cli/menu/menu.py | 1 + src/cli/wizard.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++ src/settings.cfg | 15 +++++++ src/util/uiTools.py | 11 +++++ 8 files changed, 135 insertions(+), 2 deletions(-) diff --git a/README b/README index 44fabf1..835b02b 100644 --- a/README +++ b/README @@ -187,6 +187,7 @@ Layout: headerPanel.py - top of all pages, providing general information descriptorPopup.py - displays connection descriptor data popups.py - toolkit providing display popups + wizard.py - provides the relay setup wizard 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 1564f68..435883d 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", "popups", "torrcPanel"] +__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel", "wizard"] diff --git a/src/cli/controller.py b/src/cli/controller.py index e20e023..e771a26 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -8,6 +8,7 @@ import curses import threading import cli.menu.menu +import cli.wizard import cli.popups import cli.headerPanel import cli.logPanel @@ -455,6 +456,7 @@ def startTorMonitor(startTime): cli.graphing.graphPanel.loadConfig(config) cli.connections.connEntry.loadConfig(config) + cli.wizard.loadConfig(config) # attempts to fetch the tor pid, warning if unsuccessful (this is needed for # checking its resource usage, among other things) @@ -536,7 +538,8 @@ def drawTorMonitor(stdscr, startTime): # main draw loop overrideKey = None # uses this rather than waiting on user input isUnresponsive = False # flag for heartbeat responsiveness check - + if not torTools.getConn().isAlive(): overrideKey = ord('w') # shows wizard + while not control.isDone(): displayPanels = control.getDisplayPanels() isUnresponsive = heartbeatCheck(isUnresponsive) @@ -593,6 +596,8 @@ def drawTorMonitor(stdscr, startTime): log.log(log.ERR, "Error detected when reloading tor: %s" % sysTools.getFileErrorMsg(exc)) elif key == ord('h') or key == ord('H'): overrideKey = cli.popups.showHelpPopup() + elif key == ord('w') or key == ord('W'): + cli.wizard.showWizard() else: for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index c571bd8..3c90b10 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -5,6 +5,7 @@ Generates the menu for arm, binding options with their related actions. import functools import cli.popups +import cli.wizard import cli.controller import cli.menu.item import cli.graphing.graphPanel @@ -53,6 +54,7 @@ def makeActionsMenu(): actionsMenu = cli.menu.item.Submenu("Actions") actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) actionsMenu.add(cli.menu.item.MenuItem("New Identity", headerPanel.sendNewnym)) + actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index 1dbbbd0..8302551 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -109,6 +109,7 @@ def showMenu(): popup.win.refresh() + curses.cbreak() key = control.getScreen().getch() cursor.handleKey(key) diff --git a/src/cli/wizard.py b/src/cli/wizard.py new file mode 100644 index 0000000..2b7cdf7 --- /dev/null +++ b/src/cli/wizard.py @@ -0,0 +1,98 @@ +""" +Provides user prompts for setting up a new relay. This autogenerates a torrc +that's used by arm to start its tor instance. +""" + +import curses + +import cli.popups +import cli.controller + +from util import enum, uiTools + +# basic configuration types we can run as +RunType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") + +# other options provided in the prompts +CANCEL, BACK = "Cancel", "Back" + +CONFIG = {"wizard.role.message": "", + "wizard.role.option.label": {}, + "wizard.role.option.description": {}} + +def loadConfig(config): + config.update(CONFIG) + +def showWizard(): + myRole = promptRunType() + +def promptRunType(): + """ + Provides a prompt for selecting the general role we'd like Tor to run with. + This returns a RunType enumeration for the selection, or None if the dialog + was canceled. + """ + + popup, _, _ = cli.popups.init(23, 58) + 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 RunType.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, 54, None, endType = None, getRemainder = True) + descLines.append(descLine.strip()) + + options.append((runType, label, descLines)) + + 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 + + while not uiTools.isSelectionKey(key): + offset = 0 + + for i in range(len(options)): + _, label, lines = options[i] + optionFormat = format | curses.A_STANDOUT if i == selection else format + + # 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 + 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: + 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) + elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel + finally: + cli.popups.finalize() + + selectedOption = options[selection][0] + return None if selectedOption == CANCEL else selectedOption + diff --git a/src/settings.cfg b/src/settings.cfg index bced9a4..2ad2784 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -340,6 +340,21 @@ 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? + +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.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. + # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions torrc.map HiddenServicePort => HiddenServiceOptions diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 40a3087..52885de 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -282,6 +282,17 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg +def padStr(msg, size): + """ + Provides the string padded with whitespace to the given length. + + Arguments: + msg - string to be padded + size - length to be padded to + """ + + return ("%%-%is" % size) % msg + def camelCase(label, divider = "_", joiner = " "): """ Converts the given string to camel case, ie:

1 0

[torbrowser/master] add forbidWebGL to other firefox prefs too
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 3db16648327a3491b3c4c7d343d9e644f7494868 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 19:31:46 2011 -0300 add forbidWebGL to other firefox prefs too --- build-scripts/config/no-polipo.js | 1 + build-scripts/config/prefs.js | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo.js b/build-scripts/config/no-polipo.js index 8e1e7b8..cb6594c 100644 --- a/build-scripts/config/no-polipo.js +++ b/build-scripts/config/no-polipo.js @@ -152,6 +152,7 @@ user_pref("noscript.autoReload", false); user_pref("noscript.contentBlocker", true); user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.forbidWebGL", true); user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index 5bc03ba..bff1602 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -152,6 +152,7 @@ user_pref("noscript.autoReload", false); user_pref("noscript.contentBlocker", true); user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.forbidWebGL", true); user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3);

1 0

[torbrowser/master] bump tbb linux to 1.1.11-dev, tor to 0.2.2.29-beta
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 6ff7e56073519d2b1ceee8e2fd7d4e4aee863895 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 19:12:17 2011 -0300 bump tbb linux to 1.1.11-dev, tor to 0.2.2.29-beta --- README.Linux | 11 ++++++++--- build-scripts/linux.mk | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.Linux b/README.Linux index 37c165c..05ea71b 100644 --- a/README.Linux +++ b/README.Linux @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.28-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) +Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) Firefox 3.6.17 \_ Torbutton 1.2.5 - |_ NoScript 2.1.1 + |_ NoScript 2.1.1.1 |_ BetterPrivacy 1.51 - |_ HTTPS Everywhere 0.9.9.development.5 + |_ HTTPS Everywhere 0.9.9.development.6 Usage ----- @@ -29,6 +29,11 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.11: Released 2011-06-21 + Update Tor to 0.2.2.29-beta + Update NoScript to 2.1.1.1 + Update HTTPS-Everywhere to 0.9.9.development.6 + 1.1.10: Released 2011-06-05 Update Tor to 0.2.2.28-beta Update Libevent to 2.0.12-stable diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a58756e..079c21a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -41,17 +41,17 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.5 +HTTPSEVERY_VER=0.9.9.development.6 FIREFOX_VER=3.6.17 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1 +NOSCRIPT_VER=2.1.1.1 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.28-beta +TOR_VER=0.2.2.29-beta TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.10-dev +VERSION=1.1.11-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/master] bump tbb osx to 1.0.19-dev, tor to 0.2.2.29-beta
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit cf71f89652aba1b3f6445b31fa52f0973f49cb80 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 19:07:24 2011 -0300 bump tbb osx to 1.0.19-dev, tor to 0.2.2.29-beta --- README.OSX | 11 ++++++++--- build-scripts/osx.mk | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.OSX b/README.OSX index 000e7a4..04358e8 100644 --- a/README.OSX +++ b/README.OSX @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.28-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) +Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) Polipo 1.0.4.1 Firefox 3.6.17 \_ Torbutton 1.2.5 - |_ NoScript 2.1.1 - |_ HTTPS-Everywhere 0.9.9.development.5 + |_ NoScript 2.1.1.1 + |_ HTTPS-Everywhere 0.9.9.development.6 |_ BetterPrivacy 1.51 Usage @@ -24,6 +24,11 @@ To exit, close Firefox and Vidalia. Changelog --------- +1.0.19: Released 2011-06-21 + Update Tor to 0.2.2.29-beta + Update NoScript to 2.1.1.1 + Update HTTPS-Everywhere to 0.9.9.development.6 + 1.0.18: Released 2011-06-05 Update Tor to 0.2.2.28-beta Update Libevent to 2.0.12-stable diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 94fffde..6eca7be 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -41,17 +41,17 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=0.9.9.development.5 +HTTPSEVERY_VER=0.9.9.development.6 FIREFOX_VER=3.6.17 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1 +NOSCRIPT_VER=2.1.1.1 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.28-beta +TOR_VER=0.2.2.29-beta TORBUTTON_VER=1.2.5 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5 @@ -211,7 +211,7 @@ NAME=TorBrowser DISTDIR=tbbosx-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.0.18-dev +VERSION=1.0.19-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] bump tbb ff4 linux version to 2.2.29, bump extension and libevent version
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 06df009e6a9dbf6be39dd131f5d071903b18acd6 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 18:14:34 2011 -0300 bump tbb ff4 linux version to 2.2.29, bump extension and libevent version --- README.LINUX-2.2 | 8 ++++---- build-scripts/linux.mk | 2 +- changelog.linux-2.2 | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index df7160e..8455d06 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Tumucumaque) 4.0.1 \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.0.5 - |_ HTTPS-Everywhere 0.9.9.development.5 - |_ BetterPrivacy 1.50 + |_ NoScript 2.1.1.1 + |_ HTTPS-Everywhere 0.9.9.development.6 + |_ BetterPrivacy 1.51 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index ed792b1..aaeb11d 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -154,7 +154,7 @@ NAME=tor-browser DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.27-1-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9aa89c4..e87f008 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.29-1) alpha; suite=linux + + * Update Tor to 0.2.2.29-beta + * Update Libevent to 2.0.12-stable + * Update HTTPS Everywhere to 0.9.9.development.6 + * Update NoScript to 2.1.1.1 + * Update BetterPrivacy to 1.51 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 18:06:27 ART 2011 + Tor Browser Bundle (2.2.27-1) alpha; suite=linux * Update Tor to 0.2.2.27-beta

1 0

[torbrowser/maint-2.2] bump tbb ff4 win version to 2.2.29, bump extension and libevent version, add forbidWebGL option to firefox prefs
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 21fcc4e7c03093f2dd3e425a5b1621c4b0f04858 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 18:05:53 2011 -0300 bump tbb ff4 win version to 2.2.29, bump extension and libevent version, add forbidWebGL option to firefox prefs --- README.WIN-2.2 | 8 ++++---- build-scripts/config/windows-4.0.js | 1 + build-scripts/windows.mk | 2 +- changelog.win-2.2 | 10 ++++++++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 69acdac..cf382c8 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,14 +5,14 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.27-beta (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 FirefoxPortable 4.0.1 \_ Firefox 4.0.1 \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.0.5 - |_ HTTPS-Everywhere 0.9.9.development.5 - |_ BetterPrivacy 1.50 + |_ NoScript 2.1.1.1 + |_ HTTPS-Everywhere 0.9.9.development.6 + |_ BetterPrivacy 1.51 Usage ----- diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index ac20369..fc73c6c 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -133,6 +133,7 @@ user_pref("noscript.autoReload", false); user_pref("noscript.contentBlocker", true); user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); user_pref("noscript.firstRunRedirection", false); +user_pref("noscript.forbidWebGL", true); user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9bb2c4a..4100940 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -144,7 +144,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=2.2.25-1-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 2acec07..19c2e12 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.29-1) alpha; suite=windows + + * Update Tor to 0.2.2.29-beta + * Update Libevent to 2.0.12-stable + * Update HTTPS Everywhere to 0.9.9.development.6 + * Update NoScript to 2.1.1.1 + * Update BetterPrivacy to 1.51 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 18:00:51 ART 2011 + Tor Browser Bundle (2.2.27-1) alpha; suite=windows * Update Tor to 0.2.2.27-beta

1 0

[torbrowser/maint-2.2] add noscript.forbidWebGL to firefox prefs
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 6bedad2e9ed6de6f81a37d1071b44c4a9e4ed67e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 17:53:37 2011 -0300 add noscript.forbidWebGL to firefox prefs --- build-scripts/config/no-polipo-4.0.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 1192ec8..06a8f4d 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -123,6 +123,7 @@ user_pref("noscript.firstRunRedirection", false); user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); +user_pref("noscript.forbidWebGL", true); user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); user_pref("noscript.policynames", ""); user_pref("noscript.secureCookies", true);

1 0

[torbrowser/maint-2.2] bump release version to 2.2.29 and Tor version to 0.2.2.29-beta
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit d9fb18cb70cb4aa914b8439b62b3e56ababd6aa9 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 16:57:04 2011 -0300 bump release version to 2.2.29 and Tor version to 0.2.2.29-beta --- build-scripts/versions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1534a4c..a1274af 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.28 +RELEASE_VER=2.2.29 HTTPSEVERY_VER=0.9.9.development.6 FIREFOX_VER=4.0.1 @@ -12,7 +12,7 @@ OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.28-beta +TOR_VER=0.2.2.29-beta TORBUTTON_VER=1.3.3-alpha VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5

1 0

[torbrowser/maint-2.2] bump other new versions, update changelog for tbb osx 2.2.29-1 release
by erinn＠torproject.org 21 Jun '11

21 Jun '11

commit 26ae5c807aeb9d1455225bdf0472544f0fb00eea Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jun 21 16:58:16 2011 -0300 bump other new versions, update changelog for tbb osx 2.2.29-1 release --- README.OSX-2.2 | 6 +++--- build-scripts/versions.mk | 4 ++-- changelog.osx-2.2 | 10 ++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index b8d2fc5..949dd7e 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.28-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Tumucumaque) 4.0.1 \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1 - |_ HTTPS-Everywhere 0.9.9.development.5 + |_ NoScript 2.1.1.1 + |_ HTTPS-Everywhere 0.9.9.development.6 |_ BetterPrivacy 1.51 Usage diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 777afe1..1534a4c 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,11 +2,11 @@ RELEASE_VER=2.2.28 -HTTPSEVERY_VER=0.9.9.development.5 +HTTPSEVERY_VER=0.9.9.development.6 FIREFOX_VER=4.0.1 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1 +NOSCRIPT_VER=2.1.1.1 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 6dffa27..b4ab673 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.29-1) alpha; suite=osx + + * Update Tor to 0.2.2.29-beta + * Update HTTPS Everywhere to 0.9.9.development.6 + * Update NoScript to 2.1.1.1 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 16:43:39 ART 2011 + Tor Browser Bundle (2.2.28-1) alpha; suite=osx * Update Tor to 0.2.2.28-beta @@ -5,6 +13,8 @@ Tor Browser Bundle (2.2.28-1) alpha; suite=osx * Update NoScript to 2.1.1 * Update BetterPrivacy to 1.51 + -- Erinn Clark <erinn(a)torproject.org> Mon Jun 6 20:25:53 ART 2011 + Tor Browser Bundle (2.2.27-1) alpha; suite=osx * Update Tor to 0.2.2.27-beta

1 0