- tor-commits - lists.torproject.org

[vidalia/master] Bump stable version to 0.2.16-git
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 14cc7b592420ef4101c5e59261986be7defa2542 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 14:03:54 2011 -0300 Bump stable version to 0.2.16-git --- CMakeLists.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9303d6b..1738c78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(VER_MAJOR "0") set(VER_MINOR "2") -set(VER_PATCH "15") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") +set(VER_PATCH "16") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

[vidalia/master] Do not reopen firefox if it is not needed
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 9daeccd8077989e1403fe64c9e0e653eb2a365e8 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 14:01:31 2011 -0300 Do not reopen firefox if it is not needed --- src/vidalia/MainWindow.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index bbd86d2..c9cb8a8 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -647,7 +647,8 @@ MainWindow::launchBrowserFromDirectory() commandLine << profileDir; /* Launch the browser */ - _browserProcess->start(browserExecutable, commandLine); + if(!_browserProcess->state() != QProcess::NotRunning) + _browserProcess->start(browserExecutable, commandLine); _browserProcess->toForeground(); } @@ -665,7 +666,8 @@ MainWindow::startSubprocesses() } else if (!(subprocess = settings.getBrowserExecutable()).isEmpty()) { /* BrowserDirectory is not set, but BrowserExecutable is; use this */ _browserProcess->setEnvironment(updateBrowserEnv()); - _browserProcess->start(subprocess, QStringList()); + if(!_browserProcess->state() != QProcess::NotRunning) + _browserProcess->start(subprocess, QStringList()); _browserProcess->toForeground(); }

1 0

[vidalia/master] Merge branch 'bug3195_startfirefox'
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit e0433c102ab69e64d98d95e01db60443a9a7abe0 Merge: 14cc7b5 9daeccd Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 14:05:06 2011 -0300 Merge branch 'bug3195_startfirefox' src/vidalia/MainWindow.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)

1 0

r25267: {website} specify there are 8 dir auths (website/trunk/docs/en)
by Roger Dingledine 24 Dec '11

24 Dec '11

Author: arma Date: 2011-12-24 02:38:37 +0000 (Sat, 24 Dec 2011) New Revision: 25267 Modified: website/trunk/docs/en/faq.wml Log: specify there are 8 dir auths Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-12-24 02:16:39 UTC (rev 25266) +++ website/trunk/docs/en/faq.wml 2011-12-24 02:38:37 UTC (rev 25267) @@ -1573,8 +1573,9 @@ of all the known relays, and in that list are a set of certificates from each relay (self-signed by their identity key) specifying their keys, locations, exit policies, and so on. So unless the adversary can control - a threshold of the directory authorities, he can't trick the Tor client - into using other Tor relays. + a majority of the directory authorities (as of 2011 there were 8 + directory authorities), he can't trick the Tor client into using + other Tor relays. </p> <p>

1 0

r25266: {website} redirect bitcoin donations to those who accept it. (website/trunk/donate/en)
by Andrew Lewman 24 Dec '11

24 Dec '11

Author: phobos Date: 2011-12-24 02:16:39 +0000 (Sat, 24 Dec 2011) New Revision: 25266 Modified: website/trunk/donate/en/donate.wml Log: redirect bitcoin donations to those who accept it. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-12-23 11:49:00 UTC (rev 25265) +++ website/trunk/donate/en/donate.wml 2011-12-24 02:16:39 UTC (rev 25266) @@ -24,10 +24,13 @@ <li><a href="#amazon">Amazon Payments</a></li> <li><a href="#google">Google Checkout</a></li> <li><a href="#givv">Givv.org</a></li> - <li class="last"><a href="#cash">checks, money orders, bank transfers, stock grants or -other more sophisticated transactions</a></li> + <li><a href="#cash">checks, money orders, bank transfers, stock + grants, or other more sophisticated transactions</a></li> + <li class="last"><a href="#bitcoin">bitcoin</a></li> </ul> - <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p> + <p>If you want to make an anonymous donation, please do so in an + anonymous way. Contact us at donations(a)torproject.org for more + donation details.</p>  <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> @@ -192,7 +195,10 @@ <a id="givv"></a> <div class="dbox dsmall givv"> <h3>Donate via Givv.org</h3> - <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. <strong>You stay anonymous and stay in control!</strong></p> + <p>Givv.org is a new way to think about making your impact. Make + one monthly donation. To as many nonprofits as you like. Automatic, + one-click giving. <strong>You stay anonymous to Tor and stay in + control!</strong></p> <p style="text-align:center;"><strong><a href="http://givv.org/recipients/the-tor-project">Continue to Givv.org »</a></strong></p> </div>  @@ -207,7 +213,8 @@ 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 USA</p>  - <h3 style="margin-top:20px;">Donate via Wire or Bank Transfer</h3> + + <h3 style="margin-top:20px;">Donate via Wire or Bank Transfer</h3> <h4>US Transfers</h4> <p>For US donations via wire or ACH transfer, please contact us for the relevant information.</p> <h4>European Transfers</h4> @@ -240,6 +247,20 @@ </div> </div>  + + <a id="bitcoin"></a> + <div class="hundred toptwenty"> + <div class="dbox donate"> + <h3>Bitcoins</h3> + <p>Instead of donating bitcoins to Tor, + please consider a donation to either <a + href="https://www.torservers.net/donate.html">Torservers.net</a> + or <a href="http://noisetor.net/">NoiseTor</a>. Either of these + organizations will turn your bitcoin donation into a faster, larger + Tor Network for all.</p> + </div> + </div> +  </div> <div id = "sidecol">

1 0

[torbrowser/maint-2.3] Changes $PATH variable for build-tor target so that openssl's dlls can be found and linked against.
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 7e3bf3b33d9be23a2833276fef3f91b9ccff014c Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 16 21:37:20 2011 +0100 Changes $PATH variable for build-tor target so that openssl's dlls can be found and linked against. --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9cf24dc..8c2971f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -106,6 +106,7 @@ TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +build-tor:PATH+=:$(BUILT_DIR)/bin build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make

1 0

[torbrowser/master] Changes $PATH variable for build-tor target so that openssl's dlls can be found and linked against.
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 7e3bf3b33d9be23a2833276fef3f91b9ccff014c Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 16 21:37:20 2011 +0100 Changes $PATH variable for build-tor target so that openssl's dlls can be found and linked against. --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9cf24dc..8c2971f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -106,6 +106,7 @@ TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +build-tor:PATH+=:$(BUILT_DIR)/bin build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make

1 0

[torbrowser/maint-2.2] Changes $PATH variable for build-tor target so that openssl's dlls can be found and linked against.
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 7e3bf3b33d9be23a2833276fef3f91b9ccff014c Author: Shondoit Walker <shondoit(a)gmail.com> Date: Wed Nov 16 21:37:20 2011 +0100 Changes $PATH variable for build-tor target so that openssl's dlls can be found and linked against. --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9cf24dc..8c2971f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -106,6 +106,7 @@ TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +build-tor:PATH+=:$(BUILT_DIR)/bin build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) cd $(TOR_DIR) && make

1 0

[arm/master] Skipping import of readline when showing cli
by atagar＠torproject.org 23 Dec '11

23 Dec '11

commit b86e5bf8d186124e3e7cc7d76e737b33bf174ab0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 23 08:11:54 2011 -0800 Skipping import of readline when showing cli Commit 3e1a135, which added a startup option for running the control interpretor without the rest of arm, also caused us to inadvertantly import the readline module prior to starting curses. This import ordering royally screws the terminal in some use cases, most noticeably if you... - start arm within a screen session - detatch and resize the terminal - reattach to the screen session I've seen several other terminal glitches that I'm suspecting is related to this too, but until now didn't have a repro case. I'm fixing this by removing the readline import entirely unless we're specifically showing the prompt. Thanks to Stephan Seitz for catching this and suggesting a repo! --- src/util/torInterpretor.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 1ff3b84..4fa0dff 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -6,7 +6,6 @@ directly, history and tab completion. import re import sys -import readline import version @@ -961,6 +960,13 @@ class ControlInterpretor: return (inputLines, outputLines) def showPrompt(): + # When displaying the prompt we want the readline module to be imported so + # we get its neat features like history scrollback. HOWEVER, importing + # readline prior to initializing curses causes terminal bugs, most noticeably + # screen resizing. + + import readline + # For Python 2.6 and earlier cycling history via the readline module with # up/down is buggy with a color prompt. For more information see: # http://bugs.python.org/issue12972

1 0

[torbrowser/maint-2.3] bump recommended-versions to 2.2.35-3
by erinn＠torproject.org 23 Dec '11

23 Dec '11

commit 2e213ee39f15d72367100aea8cf51a61d8e1dcb3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 23 12:34:33 2011 +0100 bump recommended-versions to 2.2.35-3 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ae01274..293d0b4 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-1-Linux-i686", -"2.2.35-1-Linux-x86_64", -"2.2.35-1-MacOS-i386", -"2.2.35-1-MacOS-x86_64", -"2.2.35-1-Windows" +"2.2.35-3-Linux-i686", +"2.2.35-3-Linux-x86_64", +"2.2.35-3-MacOS-i386", +"2.2.35-3-MacOS-x86_64", +"2.2.35-3-Windows" ]

1 0