- tor-commits - lists.torproject.org

[arm/master] Adding menu option to shut down tor
by atagar＠torproject.org 10 Jul '11

10 Jul '11

commit 2b5602ac329c6e0d45ba9d2cdfb5d7b4eb11c061 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 16:21:07 2011 -0700 Adding menu option to shut down tor --- src/cli/menu/actions.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 3c90b10..db9d178 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -50,17 +50,22 @@ def makeActionsMenu(): """ control = cli.controller.getController() + conn = torTools.getConn() headerPanel = control.getPanel("header") 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)) + + if conn.isAlive(): + actionsMenu.add(cli.menu.item.MenuItem("Stop Tor", conn.shutdown)) + + actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", conn.reload)) actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True actionsMenu.add(cli.menu.item.MenuItem(label, functools.partial(control.setPaused, arg))) - actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", torTools.getConn().reload)) actionsMenu.add(cli.menu.item.MenuItem("Exit", control.quit)) return actionsMenu

1 0

[arm/master] Wizard option to use the last configuration
by atagar＠torproject.org 10 Jul '11

10 Jul '11

commit 8e74e50a7adaec6d1f786248f2600658328292da Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:03:14 2011 -0700 Wizard option to use the last configuration --- src/cli/wizard.py | 23 ++++++++++++++++++----- src/settings.cfg | 2 ++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8a5a138..e2419e8 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -20,7 +20,7 @@ from util import connections, enum, log, torConfig, torTools, uiTools TORRC_TEMPLATE = "resources/torrcTemplate.txt" # basic configuration types we can run as -RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +RelayType = enum.Enum("RESUME", "RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured Options = enum.Enum("DIVIDER", "CONTROL", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") @@ -252,15 +252,20 @@ def showWizard(): _toggleEnabledAction(bridgeEntries, useBridgeOpt, useBridgeOpt.getValue()) # remembers the last selection made on the type prompt page - relaySelection = RelayType.RELAY controller = cli.controller.getController() manager = controller.getTorManager() + relaySelection = RelayType.RESUME if manager.isTorrcAvailable() else RelayType.RELAY while True: if relayType == None: selection = promptRelayType(relaySelection) if selection == CANCEL: break + elif selection == RelayType.RESUME: + if not manager.isManaged(torTools.getConn()): + manager.startManagedInstance() + + break else: relayType, relaySelection = selection, selection else: selection = promptConfigOptions(relayType, config) @@ -310,12 +315,20 @@ def promptRelayType(initialSelection): dialog was canceled. """ - popup, _, _ = cli.popups.init(25, 58) - if not popup: return - control = cli.controller.getController() options = [ConfigOption(opt, "role", opt) for opt in RelayType.values()] options.append(ConfigOption(CANCEL, "general", CANCEL)) selection = RelayType.indexOf(initialSelection) + height = 28 + + # drops the resume option if it isn't applicable + control = cli.controller.getController() + if not control.getTorManager().isTorrcAvailable(): + options.pop(0) + height -= 3 + selection -= 1 + + popup, _, _ = cli.popups.init(height, 58) + if not popup: return try: popup.win.box() diff --git a/src/settings.cfg b/src/settings.cfg index f15aa49..4551b43 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -397,6 +397,7 @@ wizard.blankValue Bridge3 => <ip address>:<port> wizard.label.general Cancel => Cancel wizard.label.general Back => Previous wizard.label.general Next => Next +wizard.label.role Resume => Use Last Configuration wizard.label.role Relay => Internal Relay wizard.label.role Exit => Exit Relay wizard.label.role Bridge => Bridge @@ -425,6 +426,7 @@ wizard.label.opt Bridge3 => Third Bridge wizard.label.opt Reuse => Circuit Duration wizard.description.general Cancel => Close without starting Tor. +wizard.description.role Resume => Start Tor with the last configuration you made. 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 network and 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.

1 0

[arm/master] fix: closing control connection on shutdown call
by atagar＠torproject.org 10 Jul '11

10 Jul '11

commit 22e2e98adcd07c27510c7c21ac602f6f26b0d62a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 17:23:38 2011 -0700 fix: closing control connection on shutdown call Making the shutdown function close the control connection right away if the signal should be shutting down tor right away. Without this it was taking around five seconds for the connection closure to be reflected in the interface. --- src/util/torTools.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 0fb71a8..4a18a4f 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1480,8 +1480,12 @@ class Controller(TorCtl.PostEventListener): raisedException = None if self.isAlive(): try: + isRelay = self.getOption("ORPort") != None signal = "HALT" if force else "SHUTDOWN" self.conn.send_signal(signal) + + # shuts down control connection if we aren't making a delayed shutdown + if force or not isRelay: self.close() except Exception, exc: raisedException = IOError(str(exc))

1 0

[arm/master] Adding menu option to start managed instance
by atagar＠torproject.org 10 Jul '11

10 Jul '11

commit 30ab0618ff30c754b9a07dc25b80da4fa269e578 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 17:04:22 2011 -0700 Adding menu option to start managed instance If we've already made a custom torrc then providing a menu option to use it. --- src/cli/menu/actions.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index db9d178..7f63b1b 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -50,6 +50,7 @@ def makeActionsMenu(): """ control = cli.controller.getController() + manager = control.getTorManager() conn = torTools.getConn() headerPanel = control.getPanel("header") actionsMenu = cli.menu.item.Submenu("Actions") @@ -58,6 +59,8 @@ def makeActionsMenu(): if conn.isAlive(): actionsMenu.add(cli.menu.item.MenuItem("Stop Tor", conn.shutdown)) + elif manager.isTorrcAvailable(): + actionsMenu.add(cli.menu.item.MenuItem("Start Tor", manager.startManagedInstance)) actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", conn.reload)) actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard))

1 0

[flashproxy/master] Don't allocate a TextField unless in debug mode.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit 91bb22746d1364843921c87ea9fa6910ccbd080a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 9 14:32:06 2011 -0700 Don't allocate a TextField unless in debug mode. --- swfcat.as | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/swfcat.as b/swfcat.as index 38ed1ab..dbf2fb4 100644 --- a/swfcat.as +++ b/swfcat.as @@ -57,8 +57,10 @@ package public function puts(s:String):void { - output_text.appendText(s + "\n"); - output_text.scrollV = output_text.maxScrollV; + if (output_text) { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } } public function swfcat() @@ -67,13 +69,6 @@ package stage.scaleMode = StageScaleMode.NO_SCALE; stage.align = StageAlign.TOP_LEFT; - output_text = new TextField(); - output_text.width = stage.stageWidth; - output_text.height = stage.stageHeight; - output_text.background = true; - output_text.backgroundColor = 0x001f0f; - output_text.textColor = 0x44cc44; - badge = new Badge(); if (RATE_LIMIT) @@ -81,7 +76,6 @@ package else rate_limit = new RateUnlimit(); - puts("Starting."); // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); } @@ -90,12 +84,19 @@ package { var fac_spec:String; - puts("Parameters loaded."); - - if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) + if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) { + output_text = new TextField(); + output_text.width = stage.stageWidth; + output_text.height = stage.stageHeight; + output_text.background = true; + output_text.backgroundColor = 0x001f0f; + output_text.textColor = 0x44cc44; addChild(output_text); - else + } else { addChild(badge); + } + + puts("Parameters loaded."); fac_addr = get_param_addr("facilitator", DEFAULT_FACILITATOR_ADDR); if (!fac_addr) {

1 0

r24888: {website} update the Makefile to 0.2.2.30-rc. (website/trunk)
by Andrew Lewman 09 Jul '11

09 Jul '11

Author: phobos Date: 2011-07-09 11:40:31 +0000 (Sat, 09 Jul 2011) New Revision: 24888 Modified: website/trunk/Makefile Log: update the Makefile to 0.2.2.30-rc. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-07-09 10:57:46 UTC (rev 24887) +++ website/trunk/Makefile 2011-07-09 11:40:31 UTC (rev 24888) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=/home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.29-beta -export DEVTAG=tor-0.2.2.29-beta +export STABLETAG=tor-0.2.2.30-rc +export DEVTAG=tor-0.2.2.30-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

r24887: {website} Fix typo (website/trunk/docs/en)
by Robert Ransom 09 Jul '11

09 Jul '11

Author: rransom Date: 2011-07-09 10:57:46 +0000 (Sat, 09 Jul 2011) New Revision: 24887 Modified: website/trunk/docs/en/faq.wml Log: Fix typo Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-07-09 03:56:31 UTC (rev 24886) +++ website/trunk/docs/en/faq.wml 2011-07-09 10:57:46 UTC (rev 24887) @@ -31,7 +31,7 @@ funding?</a></li> <li><a href="#Metrics">How many people use Tor? How many relays or exit nodes are there?</a></li> - <li><a href="#SSLcertfingerprint">What are your SSL cerificate + <li><a href="#SSLcertfingerprint">What are your SSL certificate fingerprints?</a></li> </ul>

1 0

[flashproxy/master] Add HTML snippet to embed SWF.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit e32a864df5584e359bc63cec957461205f9f205a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 8 23:46:29 2011 -0700 Add HTML snippet to embed SWF. --- README | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/README b/README index ef2cc65..cd6b7dd 100644 --- a/README +++ b/README @@ -148,6 +148,14 @@ an HTTP respose. \r\n client=<ip-addr/rtmfp-id>&relay=<relay-ip> +== Embedding in HTML + +<object width="70" height="23"> + <param name="movie" value="swfcat.swf"> + <param name="flashvars" value=""> + <embed src="swfcat.swf" width="70" height="23" flashvars=""></embed> +</object> + == ActionScript programming A good tutorial on ActionScript programming with the Flex tools, with

1 0

[torbrowser/maint-2.2] update firefox build targets
by erinn＠torproject.org 09 Jul '11

09 Jul '11

commit d91ba82da4a8a6b915910a46a7b8465a556cfe1a Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Jul 9 02:17:38 2011 -0300 update firefox build targets --- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 1fa698f..5f00421 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -101,9 +101,9 @@ build-tor: cd $(TOR_DIR) && make cd $(TOR_DIR) && make install -FIREFOX_DIR=$(FETCH_DIR)/mozilla-2.0 +FIREFOX_DIR=$(FETCH_DIR)/mozilla-release build-firefox: - cp ../src/current-patches/*firefox* $(FIREFOX_DIR) + cp ../src/current-patches/*Firefox5* $(FIREFOX_DIR) cp patch-firefox-src.sh $(FIREFOX_DIR) cp $(CONFIG_SRC)/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig cd $(FIREFOX_DIR) && ./patch-firefox-src.sh diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index a1274af..ae94848 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -28,7 +28,7 @@ VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz TOR_PACKAGE=tor-$(TOR_VER).tar.gz PIDGIN_PACKAGE=pidgin-$(PIDGIN_VER).tar.bz2 -FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).tar.bz2 +FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) @@ -38,7 +38,7 @@ VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=http://www.monkey.org/~provos/$(LIBEVENT_PACKAGE) TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… -#FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/en-US/$(FIREFOX_PACKAGE) +FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/source/$(FIREFOX_PACKAGE) fetch-source: -mkdir $(FETCH_DIR) @@ -48,6 +48,10 @@ fetch-source: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL) $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL) +fetch-firefox: + -rm -rf $(FETCH_DIR)/mozilla-release + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) + unpack-source: cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)

1 0

[torbrowser/maint-2.2] bump tor to 0.2.2.30-rc, bump other versions for 2.2.30 release
by erinn＠torproject.org 09 Jul '11

09 Jul '11

commit cd968506fdcf096e0d0950f137f118cff996c9e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Jul 9 02:17:54 2011 -0300 bump tor to 0.2.2.30-rc, bump other versions for 2.2.30 release --- build-scripts/versions.mk | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index ae94848..e7d092a 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,19 +1,19 @@ #!/usr/bin/make -RELEASE_VER=2.2.29 +RELEASE_VER=2.2.30 -HTTPSEVERY_VER=0.9.9.development.6 -FIREFOX_VER=4.0.1 +HTTPSEVERY_VER=1.0.0development.4.xpi +FIREFOX_VER=5.0 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.1 +NOSCRIPT_VER=2.1.1.2 OPENSSL_VER=1.0.0d 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.29-beta -TORBUTTON_VER=1.3.3-alpha +TOR_VER=0.2.2.30-rc +TORBUTTON_VER=1.4.0 VIDALIA_VER=0.2.12 ZLIB_VER=1.2.5

1 0