June 2012 - tor-commits - lists.torproject.org

r25688: {website} clean up the docs some more for TBB, remove TIMBB from the p (website/trunk/projects/en)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 20:43:28 +0000 (Wed, 20 Jun 2012) New Revision: 25688 Modified: website/trunk/projects/en/torbrowser-details.wml website/trunk/projects/en/torbrowser.wml Log: clean up the docs some more for TBB, remove TIMBB from the page since it doesn't exist and just confuses everyone. Modified: website/trunk/projects/en/torbrowser-details.wml =================================================================== --- website/trunk/projects/en/torbrowser-details.wml 2012-06-20 20:31:26 UTC (rev 25687) +++ website/trunk/projects/en/torbrowser-details.wml 2012-06-20 20:43:28 UTC (rev 25688) @@ -22,8 +22,7 @@ <ul> <li>Vidalia <version-torbrowser-vidalia></li> <li>Tor <version-torbrowser-tor></li> - <li>Mozilla Aurora <version-torbrowser-firefox> and Torbutton <version-torbrowser-torbutton></li> - <li>Pidgin <version-torbrowser-pidgin> and OTR <version-torbrowser-otr> (only in Tor IM Browser Bundle)</li> + <li>Mozilla Firefox ESR and Torbutton <version-torbrowser-torbutton></li> </ul> <h3 id="alphacontents">Alpha Bundle Contents</h3> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2012-06-20 20:31:26 UTC (rev 25687) +++ website/trunk/projects/en/torbrowser.wml 2012-06-20 20:43:28 UTC (rev 25688) @@ -473,7 +473,7 @@ </ul> <p id="Download-torbrowserbundlealpha" style="font-size: 120%; margin: - 5mm">ALPHA: Tor Browser Bundle alpha versions for Windows (<version-torbrowserbundlealpha>), Linux 32-bit (<version-torbrowserbundlelinux32alpha>) and 64-bit (<version-torbrowserbundlelinux64alpha>), and Intel Mac OS X 10.6 and higher (<version-torbrowserbundleosx32alpha>) with Firefox</p> + 5mm">ALPHA: Tor Browser Bundle alpha versions for Windows (<version-torbrowserbundlealpha>), Linux 32-bit (<version-torbrowserbundlelinux32alpha>) and 64-bit (<version-torbrowserbundlelinux64alpha>), and Intel Mac OS X 10.6 and higher (<version-torbrowserbundleosx32alpha>). </p> <ul> <li><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Windows Tor Browser Bundle alpha</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">signature</a>)</li> <li><a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Linux Tor Browser Bundle alpha (32-bit)</a> (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">signature</a>)</li> @@ -487,17 +487,15 @@ which allows you to make sure you've downloaded the file we intended you to get. Also, note that the Firefox ESR in our bundles is <a href="<tbbrepo>/build-scripts/config/">modified</a> from the <a - href="http://www.mozilla.com/firefox/">default Firefox ESR</a>; - we're currently working with Mozilla to see if they want us to change - the name to make this clearer.</p> + href="https://www.mozilla.org/en-US/firefox/organizations/">default + Firefox ESR</a></p> <a id="MacOSX"></a> <h3><a class="anchor" href="#MacOSX">Mac OS X instructions</a></h3> <p>Download the file above, save it somewhere, then click on it. Mac OS X will automatically unarchive it and you will have a TorBrowser application in your chosen language (for example, TorBrowser_en-US.app). - Click the TorBrowser application to launch Vidalia. Once Vidalia connects to Tor, it will - launch Firefox ESR.</p> + Click the TorBrowser application to launch Vidalia. Once Vidalia connects to the Tor Network, it will launch TorBrowser.</p> <p><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" /></p> @@ -553,33 +551,26 @@ <p><img src="$(IMGROOT)/tbb-screenshot2.jpg" alt="Screenshot of bundle startup" /></p> - <p>Once Tor is ready, Firefox will automatically be opened. Only web pages - visited through the included Firefox browser will be sent via Tor. Other web - browsers such as Internet Explorer are not affected. Make sure that it says - <span style="color: #0a0">"Tor Enabled"</span> (5) in the bottom right corner - before using it. To reduce the risk of confusion, don't run Firefox while using - the Tor Browser Bundle, and close existing Firefox windows before starting.</p> + <p>Once Tor is ready, Tor Browser will automatically be opened. Only web pages + visited through Tor Browser will be sent via Tor. Other web browsers + such as Internet Explorer are not affected. Make sure that it says + <span style="color: #0a0">"Tor Enabled"</span> (5) in the bottom + right corner before using it.</p> - <p>If you installed the Tor IM Browser Bundle, the Pidgin instant messaging client will also be automatically opened.</p> - - <p>Once you are finished browsing, close any open Firefox windows by - clicking on the <img src="$(IMGROOT)/tbb-close-button.png" alt="Close - button (×)" /> (6). For privacy reasons, the list of webpages - you visited and any cookies will be deleted.</p> + <p>Once you are finished browsing, close any open Tor Browser + windows by clicking on the <img src="$(IMGROOT)/tbb-close-button.png" + alt="Close button (×)" /> (6). For privacy reasons, the list + of webpages you visited and any cookies will be deleted.</p> <p><img src="$(IMGROOT)/tbb-screenshot3a.jpg" alt="Screenshot of Firefox" /></p> <p>With the Tor Browser Bundle, Vidalia and Tor will automatically - close. With the Tor IM Browser Bundle you need to also close Pidgin - by right-clicking on the Pidgin icon (7), and choosing Quit (8).</p> + close.</p> + + <p>To use the Tor Browser Bundle again, repeat the steps in <a + href="#Usage">"Usage"</a>.</p> - <p><img src="$(IMGROOT)/tbb-screenshot3b.jpg" alt="Screenshot of - Pidgin" /></p> - - <p>To use the Tor Browser Bundle or Tor IM Browser Bundle again, - repeat the steps in <a href="#Usage">"Usage"</a>.</p> - <p>Remember that Tor anonymizes the origin of your traffic, and it encrypts everything inside the Tor network, but <a href="<wikifaq>#ExitEavesdroppers">it can't encrypt your traffic @@ -605,13 +596,9 @@ website</a>.</p> <p><strong>What is in the Tor Browser Bundle?</strong> It - contains Tor, Vidalia, Firefox, and Torbutton (<a + contains Tor, Vidalia, Firefox ESR, and Torbutton (<a href="<page projects/torbrowser-details>#contents">learn more</a>).</p> - <p><strong>What is in the Tor IM Browser Bundle?</strong> It contains - Tor, Vidalia, Firefox, Torbutton, Pidgin and OTR (<a href="<page - projects/torbrowser-details>#contents">learn more</a>).</p> - <p><strong>How can I make my own bundle?</strong> To download the source code and learn how to build the bundle yourself, read the <a href="<page projects/torbrowser-details>#build">build

1 0

r25687: {website} bump versions for stable and devtags. (website/trunk)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 20:31:26 +0000 (Wed, 20 Jun 2012) New Revision: 25687 Modified: website/trunk/Makefile Log: bump versions for stable and devtags. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-06-20 20:28:07 UTC (rev 25686) +++ website/trunk/Makefile 2012-06-20 20:31:26 UTC (rev 25687) @@ -10,8 +10,8 @@ # 4. make # 5. ./publish -export STABLETAG=tor-0.2.2.36 -export DEVTAG=tor-0.2.3.15-alpha +export STABLETAG=tor-0.2.2.37 +export DEVTAG=tor-0.2.3.17-beta WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

r25686: {website} address ticket 6162 and fix references to firefox. (website/trunk/projects/en)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 20:28:07 +0000 (Wed, 20 Jun 2012) New Revision: 25686 Modified: website/trunk/projects/en/torbrowser.wml Log: address ticket 6162 and fix references to firefox. Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2012-06-20 19:10:10 UTC (rev 25685) +++ website/trunk/projects/en/torbrowser.wml 2012-06-20 20:28:07 UTC (rev 25686) @@ -79,7 +79,7 @@ e.g. the Desktop or a USB flash drive.</p> <p id="Download-torbrowserbundle" style="font-size: 120%; margin: - 5mm">Tor Browser Bundle for Windows with Firefox Aurora (version + 5mm">Tor Browser Bundle for Windows (version <version-torbrowserbundle>)</p> <ul> @@ -170,13 +170,9 @@ </ul> - <p>The Tor IM Browser Bundle has been <a - href="https://blog.torproject.org/blog/tor-im-browser-bundle-discontinued-tempora…">temporarily - discontinued</a>.</p> - <p id="Download-torbrowserbundleosx" style="font-size: 120%; margin: - 5mm">BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher - with Firefox Aurora (version <version-torbrowserbundleosx32>, 28 MB)</p> + 5mm">Tor Browser Bundle for Intel Mac OS X 10.6 and higher (version + <version-torbrowserbundleosx32>)</p> <ul> @@ -325,9 +321,9 @@ </ul> <p id="Download-torbrowserbundlelinux" style="font-size: 120%; - margin: 5mm">BETA: Tor Browser Bundle for Linux with Firefox - Aurora (version <version-torbrowserbundlelinux32> (32-bit), - <version-torbrowserbundlelinux64> (64-bit), 24 MB)</p> + margin: 5mm">BETA: Tor Browser Bundle for Linux + (version <version-torbrowserbundlelinux32> (32-bit), + <version-torbrowserbundlelinux64> (64-bit))</p> <ul> <li>English (en-US): <a @@ -489,9 +485,9 @@ <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, which allows you to make sure you've downloaded the file we intended - you to get. Also, note that the Firefox Aurora in our bundles is + you to get. Also, note that the Firefox ESR in our bundles is <a href="<tbbrepo>/build-scripts/config/">modified</a> from the <a - href="http://www.mozilla.com/firefox/">default Firefox Aurora</a>; + href="http://www.mozilla.com/firefox/">default Firefox ESR</a>; we're currently working with Mozilla to see if they want us to change the name to make this clearer.</p> @@ -501,7 +497,7 @@ X will automatically unarchive it and you will have a TorBrowser application in your chosen language (for example, TorBrowser_en-US.app). Click the TorBrowser application to launch Vidalia. Once Vidalia connects to Tor, it will - launch Firefox Aurora.</p> + launch Firefox ESR.</p> <p><img src="$(IMGROOT)/screenshot-osx-torbrowser-icon.png" alt="Screenshot Mac OS X bundle" /></p> @@ -532,7 +528,7 @@ <p>Download the file above, and save it somewhere, then double click on it. Click on the button labelled <strong>"..."</strong> (1) and select where you want - to save the bundle then click <strong>OK</strong> (2). At least 50 MB free + to save the bundle then click <strong>OK</strong> (2). At least 50 MB free space must be available in the location you select. If you want to leave the bundle on the computer, saving it to the Desktop is a good choice. If you want to move it to a different computer or limit the traces you leave behind, save @@ -622,9 +618,8 @@ instructions</a>.</p> <p>Tor Browser Bundle is partially based on <a - href="http://portableapps.com/apps/internet/firefox_portable">Mozilla - Firefox Aurora, Portable Edition</a> from <a - href="http://portableapps.com/">PortableApps.com</a>.</p> + href="https://www.mozilla.org/en-US/firefox/organizations/">Mozilla + Firefox ESR</a>.</p> </div>

1 0

r25685: {website} remove google, since we get less than 1% of our donations th (in website/trunk: donate/en images)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 19:10:10 +0000 (Wed, 20 Jun 2012) New Revision: 25685 Removed: website/trunk/images/google-checkout.gif Modified: website/trunk/donate/en/donate.wml Log: remove google, since we get less than 1% of our donations through them. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2012-06-20 19:02:03 UTC (rev 25684) +++ website/trunk/donate/en/donate.wml 2012-06-20 19:10:10 UTC (rev 25685) @@ -22,7 +22,6 @@ <ul class="hlist"> <li><a href="#paypal">Paypal</a></li> <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><a href="#cash">checks, money orders, bank transfers, stock grants, or other more sophisticated transactions</a></li> @@ -154,43 +153,6 @@ <small>Requires an Amazon Account</small> </div>  - - <a id="google"></a> - <div class="dbox dsmall"> - <h3>Donate via Google Checkout</h3> - -<script type="text/javascript"> -function validateAmount(amount){ - if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ - return true; - }else{ - alert('You must enter a valid donation.'); - amount.focus(); - return false; - } -} -</script> - - <form action="https://checkout.google.com/cws/v2/Donations/250937139555708/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top"> - <div class="drow toppad"> - <div> - <label for="google">$</label> - <input id="item_price_1" name="item_price_1" size="6" type="text" value="20"> - <input class="donate-btn" alt="Donate" src="$(IMGROOT)/google-checkout.gif" type="image"> - </div> - <input name="item_name_1" type="hidden" value="Donate to the Tor Project"> - <input name="item_description_1" type="hidden" value="Tor is written for and supported by people like you"> - <input name="item_quantity_1" type="hidden" value="1"> - <input name="item_currency_1" type="hidden" value="USD"> - <input name="item_is_modifiable_1" type="hidden" value="true"> - <input name="item_min_price_1" type="hidden" value="0.01"> - <input name="item_max_price_1" type="hidden" value="25000.0"> - <input name="_charset_" type="hidden" value="utf-8"> - </div> - </form> - <small>Requires a Google Account</small> - </div> -  <a id="givv"></a> <div class="dbox dsmall givv"> Deleted: website/trunk/images/google-checkout.gif =================================================================== (Binary files differ)

1 0

r25684: {website} fix the imgroot envvar. (website/trunk/donate/en)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 19:02:03 +0000 (Wed, 20 Jun 2012) New Revision: 25684 Modified: website/trunk/donate/en/donate.wml Log: fix the imgroot envvar. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2012-06-20 18:58:23 UTC (rev 25683) +++ website/trunk/donate/en/donate.wml 2012-06-20 19:02:03 UTC (rev 25684) @@ -176,7 +176,7 @@ <div> <label for="google">$</label> <input id="item_price_1" name="item_price_1" size="6" type="text" value="20"> - <input class="donate-btn" alt="Donate" src="${IMGROOT}/google-checkout.gif" type="image"> + <input class="donate-btn" alt="Donate" src="$(IMGROOT)/google-checkout.gif" type="image"> </div> <input name="item_name_1" type="hidden" value="Donate to the Tor Project"> <input name="item_description_1" type="hidden" value="Tor is written for and supported by people like you">

1 0

r25683: {website} move the google checkout image to a local file. (in website/trunk: donate/en images)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 18:58:23 +0000 (Wed, 20 Jun 2012) New Revision: 25683 Added: website/trunk/images/google-checkout.gif Modified: website/trunk/donate/en/donate.wml Log: move the google checkout image to a local file. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2012-06-20 18:44:59 UTC (rev 25682) +++ website/trunk/donate/en/donate.wml 2012-06-20 18:58:23 UTC (rev 25683) @@ -176,7 +176,7 @@ <div> <label for="google">$</label> <input id="item_price_1" name="item_price_1" size="6" type="text" value="20"> - <input class="donate-btn" alt="Donate" src="https://checkout.google.com/buttons/checkout.gif?merchant_id=&w=168&h=44&st…" type="image"> + <input class="donate-btn" alt="Donate" src="${IMGROOT}/google-checkout.gif" type="image"> </div> <input name="item_name_1" type="hidden" value="Donate to the Tor Project"> <input name="item_description_1" type="hidden" value="Tor is written for and supported by people like you"> Added: website/trunk/images/google-checkout.gif =================================================================== (Binary files differ) Property changes on: website/trunk/images/google-checkout.gif ___________________________________________________________________ Added: svn:mime-type + image/gif

1 0

r25682: {website} these anti-spam measures are doing nothing to stop spam, mak (website/trunk/about/en)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 18:44:59 +0000 (Wed, 20 Jun 2012) New Revision: 25682 Modified: website/trunk/about/en/contact.wml Log: these anti-spam measures are doing nothing to stop spam, make it point/click easy to send us email. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-06-20 18:25:52 UTC (rev 25681) +++ website/trunk/about/en/contact.wml 2012-06-20 18:44:59 UTC (rev 25682) @@ -28,21 +28,21 @@ A few other addresses are more specific: <ul> - <li><i>help at rt.torproject.org</i> is the address to use for Tor + <li><i>help(a)rt.torproject.org</i> is the address to use for Tor support requests. This is staffed by volunteers helping people with questions about all things Tor. This is best effort service with no guarantees.</li> - <li><i>tor-translation at lists.torproject.org</i> can put new <a href="<page + <li><i>tor-translation(a)lists.torproject.org</i> can put new <a href="<page getinvolved/translation>">website translations</a> into place, and help answer questions about existing and new translations.</li> <li><i>tordnsel at torproject.org</i> is the alias for the people responsible for the tordns exitlist.</li> - <li><i>donations at torproject.org</i> is for questions and comments about <a + <li><i>donations(a)torproject.org</i> is for questions and comments about <a href="<page donate/donate>">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more Tor</a>. We're happy to help think about creative ways for you to contribute.</li> - <li><i>execdir at torproject.org</i> is for press/media, questions and comments about + <li><i>execdir(a)torproject.org</i> is for press/media, questions and comments about Tor the non-profit corporation: trademark questions, affiliation and coordination, major gifts, contract inquiries, licensing and certification, etc.</li> @@ -88,7 +88,8 @@ <h3><a class="anchor" href="#phone">Telephone</a></h3> <p>If none of the above appeal to you, calling +1-781-948-1982 will reach the Tor office. Should there be no answer, please leave - a message with a way to reach you.</p> + a message with a way to reach you. Please email + <i>help(a)rt.torproject.org</i> for technical support.</p> </div>

1 0

r25681: {website} implement ticket 6213. (website/trunk/docs/en)
by Andrew Lewman 20 Jun '12

20 Jun '12

Author: phobos Date: 2012-06-20 18:25:52 +0000 (Wed, 20 Jun 2012) New Revision: 25681 Modified: website/trunk/docs/en/bridges.wml website/trunk/docs/en/faq.wml Log: implement ticket 6213. Modified: website/trunk/docs/en/bridges.wml =================================================================== --- website/trunk/docs/en/bridges.wml 2012-06-18 21:39:34 UTC (rev 25680) +++ website/trunk/docs/en/bridges.wml 2012-06-20 18:25:52 UTC (rev 25681) @@ -122,7 +122,7 @@ <p> Another way to find public bridge addresses is to send mail to - bridges(a)torproject.org with the line "get bridges" by itself in the + bridges(a)bridges.torproject.org with the line "get bridges" by itself in the body of the mail. You'll need to send this request from a gmail account, though — otherwise we make it too easy for an attacker to make a lot of email addresses and learn about all the bridges. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2012-06-18 21:39:34 UTC (rev 25680) +++ website/trunk/docs/en/faq.wml 2012-06-20 18:25:52 UTC (rev 25681) @@ -687,7 +687,7 @@ for the <a href="<page getinvolved/mirrors>">Tor mirrors</a> page and see if any of those copies of our website work for you. Third, you can download Tor via email: log in to your Gmail account and mail -'<tt>gettor AT torproject.org</tt>'. If you include the word 'help' +'<tt>gettor(a)gettor.torproject.org</tt>'. If you include the word 'help' in the body of the email, it will reply with instructions. Note that only a few webmail providers are supported, since they need to be able to receive very large attachments.

1 0

[stem/master] Changed mocking.mock() to accomodate modules that link to other modules.
by atagar＠torproject.org 20 Jun '12

20 Jun '12

commit 66376f5a6ebc35fd553506c226342ec8777fc9b5 Author: Erik <eislo(a)wesleyan.edu> Date: Mon Jun 18 17:01:53 2012 -0400 Changed mocking.mock() to accomodate modules that link to other modules. We ran into a problem mocking os.readlink as in certain unix environments os links to an outside module, posix. This resulted in the __dict__ of readlink remaining unchanged, and thus not mocking the realink function (which in our environment resides in the posix module). To patch this, we added a third argument to mock() that can be used to explicitly specify the target_module. A default value of None is provided so all prior calls on this method are compatible. --- test/mocking.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 347d22e..5a90f6e 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -71,7 +71,7 @@ def support_with(obj): obj.__dict__["__enter__"] = return_value(obj) obj.__dict__["__exit__"] = no_op() -def mock(target, mock_call): +def mock(target, mock_call, target_module=None): """ Mocks the given function, saving the initial implementation so it can be reverted later. @@ -87,7 +87,7 @@ def mock(target, mock_call): else: # this is a new mocking, save the original state mocking_id = MOCK_ID.next() - target_module = inspect.getmodule(target) + target_module = target_module or inspect.getmodule(target) target_function = target.__name__ MOCK_STATE[mocking_id] = (target_module, target_function, target)

1 0

[stem/master] Adding pydocs for prior mocking change
by atagar＠torproject.org 20 Jun '12

20 Jun '12

commit a4243fd09384fcbe37f076cf4ec6163c80f00839 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 20 09:37:40 2012 -0700 Adding pydocs for prior mocking change --- test/mocking.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 5a90f6e..e4245a9 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -76,8 +76,14 @@ def mock(target, mock_call, target_module=None): Mocks the given function, saving the initial implementation so it can be reverted later. + The target_module only needs to be set if the results of + 'inspect.getmodule(target)' doesn't match the module that we want to mock + (for instance, the 'os' module provies the platform module that it wraps like + 'postix', which won't work). + :param function target: function to be mocked :param functor mock_call: mocking to replace the function with + :param module target_module: module that this is mocking, this defaults to the inspected value """ if hasattr(target, "__dict__") and "mock_id" in target.__dict__:

1 0