October 2011 - tor-commits - lists.torproject.org

[tor/master] "Authetnicate" is not the usual spelling
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit 2018f86e0c7f088de54ff8f7f4d1e04075785206 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 16:41:04 2011 -0400 "Authetnicate" is not the usual spelling --- src/or/command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index aa5a62d..b090e16 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1135,7 +1135,7 @@ command_process_authenticate_cell(var_cell_t *cell, or_connection_t *conn) #define ERR(s) \ do { \ log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, \ - "Received a bad AUTHETNICATE cell from %s:%d: %s", \ + "Received a bad AUTHENTICATE cell from %s:%d: %s", \ safe_str(conn->_base.address), conn->_base.port, (s)); \ connection_mark_for_close(TO_CONN(conn)); \ return; \

1 0

[tor/maint-0.2.2] Discard all cells on a marked connection
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit cf8bffa35901a26ae840dcd715dd2f664259efb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 17:04:15 2011 -0400 Discard all cells on a marked connection Fix for bug 4299 --- changes/bug4299 | 5 +++++ src/or/command.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug4299 b/changes/bug4299 new file mode 100644 index 0000000..c43d814 --- /dev/null +++ b/changes/bug4299 @@ -0,0 +1,5 @@ + o Major bugfix: + - Do not process cells on a marked-for-close connection. We previously + avoided this by not calling read handlers on marked connections, but + that's not adequate for the case when cells are very small. Fixes + bug 4299; bugfix on 0.2.0.20-rc which first made small cells possible. diff --git a/src/or/command.c b/src/or/command.c index 1fa8bc6..5271a7a 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -132,6 +132,9 @@ command_process_cell(cell_t *cell, or_connection_t *conn) #define PROCESS_CELL(tp, cl, cn) command_process_ ## tp ## _cell(cl, cn) #endif + if (conn->_base.marked_for_close) + return; + /* Reject all but VERSIONS and NETINFO when handshaking. */ if (handshaking && cell->command != CELL_VERSIONS && cell->command != CELL_NETINFO) @@ -205,6 +208,9 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) } #endif + if (conn->_base.marked_for_close) + return; + /* reject all when not handshaking. */ if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) return;

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 Oct '11

28 Oct '11

commit 4a4c7f35985a9887cce59f46e769f727c9871db1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 28 16:46:34 2011 +0000 Update translations for tsum --- tr_TR/tsum.po | 578 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 578 insertions(+), 0 deletions(-) diff --git a/tr_TR/tsum.po b/tr_TR/tsum.po new file mode 100644 index 0000000..788a1ce --- /dev/null +++ b/tr_TR/tsum.po @@ -0,0 +1,578 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# burhan teoman <bbteoman(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-10-17 13:23+0200\n" +"PO-Revision-Date: 2011-10-28 16:36+0000\n" +"Last-Translator: burhanteoman <bbteoman(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr_TR\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. type: Plain text +#: tsum.text:2 +msgid "# The Short User Manual" +msgstr "# Kısa Kullanım Kılavuzu" + +#. type: Plain text +#: tsum.text:7 +msgid "" +"This user manual contains information about how to download Tor, how to use " +"it, and what to do if Tor is unable to connect to the network. If you can't " +"find the answer to your question in this document, email community-" +"support(a)lists.torproject.org." +msgstr "" + +#. type: Plain text +#: tsum.text:9 +#, no-wrap +msgid "" +"How Tor works\n" +"-------------\n" +msgstr "" +"Tor Nasıl çalışır\n" +"-------------\n" + +#. type: Plain text +#: tsum.text:15 +msgid "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as *relays*) in the Tor network, before the" +" traffic is sent out onto the public Internet." +msgstr "" +"Tor internetteki gizliliğinizi ve güvenliğinizi artırmanızı sağlayan sanal " +"tüneller " + +#. type: Plain text +#: tsum.text:17 +msgid "![How Tor Works](images/how-tor-works.png)" +msgstr "" + +#. type: Plain text +#: tsum.text:22 +msgid "" +"The image above illustrates a user browsing to the Twitter website over Tor." +" The green monitors represent relays in the Tor network, while the three " +"locks represent the layers of encryption between the user and each relay." +msgstr "" + +#. type: Plain text +#: tsum.text:27 +msgid "" +"Tor will anonymize the origin of your traffic, and it will encrypt " +"everything between you and the Tor network. Tor will also encrypt your " +"traffic inside the Tor network, but it cannot encrypt your traffic between " +"the Tor network and its final destination." +msgstr "" + +#. type: Plain text +#: tsum.text:32 +msgid "" +"If you are communicating sensitive information, for example when logging on " +"to a website with a username and password, make sure that you are using " +"HTTPS (e.g. **https**://twitter.com/, not **http**://twitter.com/)." +msgstr "" + +#. type: Plain text +#: tsum.text:34 +#, no-wrap +msgid "" +"How to download Tor\n" +"-------------------\n" +msgstr "" + +#. type: Plain text +#: tsum.text:40 +msgid "" +"The bundle we recommend to most users is the [Tor Browser " +"Bundle](https://www.torproject.org/projects/torbrowser.html). This bundle " +"contains a browser preconfigured to safely browse the Internet through Tor, " +"and requires no installation. You download the bundle, extract the archive, " +"and start Tor." +msgstr "" + +#. type: Plain text +#: tsum.text:44 +msgid "" +"There are two different ways to get hold of the Tor software. You can either" +" browse to the [Tor Project website](https://www.torproject.org/) and " +"download it there, or you can use GetTor, the email autoresponder." +msgstr "" + +#. type: Plain text +#: tsum.text:49 +msgid "" +"### How to get Tor via email To receive the English Tor Browser Bundle for " +"Windows, send an email to gettor(a)torproject.org with **windows** in the body" +" of the message. You can leave the subject blank." +msgstr "" + +#. type: Plain text +#: tsum.text:53 +msgid "" +"You can also request the Tor Browser Bundle for Mac OS X (write " +"**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " +"**linux-x86_64** for 64-bit systems)." +msgstr "" + +#. type: Plain text +#: tsum.text:57 +msgid "" +"If you want a translated version of Tor, write **help** instead. You will " +"then receive an email with instructions and a list of available languages." +msgstr "" + +#. type: Plain text +#: tsum.text:63 +#, no-wrap +msgid "" +"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" +"large, and you will not be able to receive any of these bundles with a\n" +"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" +"want, send an email to community-support(a)lists.torproject.org and we\n" +"will give you a list of website mirrors to use.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:69 +msgid "" +"#### How to get Tor as several small sized packages It is possible to " +"request the Tor Browser Bundle for Windows as several small sized packages, " +"instead of one big package. This can be useful if you don't have a lot of " +"bandwidth available, or if your email provider does not allow you to receive" +" large attachments." +msgstr "" + +#. type: Plain text +#: tsum.text:72 +msgid "" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" +msgstr "" + +#. type: Plain text +#: tsum.text:75 +#, no-wrap +msgid "" +"windows \n" +"split\n" +msgstr "" + +#. type: Plain text +#: tsum.text:79 +msgid "" +"It is important that you include the keyword *split* on its own line. See " +"*What to do with split packages* for information on how to unpack and re-" +"assemble the small sized packages." +msgstr "" + +#. type: Plain text +#: tsum.text:83 +msgid "" +"### How to verify that you have the right version Before running the Tor " +"Browser Bundle, you should make sure that you have the right version." +msgstr "" + +#. type: Plain text +#: tsum.text:88 +msgid "" +"The software you receive is accompanied by a file with the same name as the " +"bundle and the extension **.asc**. This .asc file is a GPG signature, and " +"will allow you to verify the file you've downloaded is exactly the one that " +"we intended you to get." +msgstr "" + +#. type: Plain text +#: tsum.text:91 +#, no-wrap +msgid "" +"Before you can verify the signature, you will have to download and\n" +"install GnuPG: \n" +msgstr "" + +#. type: Plain text +#: tsum.text:95 +#, no-wrap +msgid "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:98 +msgid "" +"Please note that you may need to edit the paths and the commands used below " +"to get it to work on your system." +msgstr "" + +#. type: Plain text +#: tsum.text:101 +msgid "" +"Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " +"Erinn's key, run:" +msgstr "" + +#. type: Plain text +#: tsum.text:103 +#, no-wrap +msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: tsum.text:105 +msgid "After importing the key, verify that the fingerprint is correct:" +msgstr "" + +#. type: Plain text +#: tsum.text:107 +#, no-wrap +msgid "\tgpg --fingerprint 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: tsum.text:109 +msgid "You should see:" +msgstr "" + +#. type: Plain text +#: tsum.text:116 +#, no-wrap +msgid "" +"\tpub 2048R/63FEE659 2003-10-16\n" +"\t Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"\tuid Erinn Clark <erinn(a)torproject.org>\n" +"\tuid Erinn Clark <erinn(a)debian.org>\n" +"\tuid Erinn Clark <erinn(a)double-helix.org>\n" +"\tsub 2048R/EB399FD7 2003-10-16\n" +msgstr "" + +#. type: Plain text +#: tsum.text:118 +msgid "" +"To verify the signature of the package you downloaded, run the following " +"command:" +msgstr "" + +#. type: Plain text +#: tsum.text:120 +#, no-wrap +msgid "" +"\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" +msgstr "" + +#. type: Plain text +#: tsum.text:126 +msgid "" +"The output should say *\"Good signature\"*. A bad signature means that the " +"file may have been tampered with. If you see a bad signature, send details " +"about where you downloaded the package from, how you verified the signature," +" and the output from GnuPG in an email to community-" +"support(a)lists.torproject.org." +msgstr "" + +#. type: Plain text +#: tsum.text:133 +msgid "" +"Once you have verified the signature and seen the *\"Good signature\"* " +"output, go ahead and extract the package archive. You should then see a " +"directory similar to **tor-browser_en-US**. Inside that directory is another" +" directory called **Docs**, which contains a file called **changelog**. You " +"want to make sure that the version number on the top line of the changelog " +"file matches the version number in the filename." +msgstr "" + +#. type: Plain text +#: tsum.text:139 +msgid "" +"### How to use the Tor Browser Bundle After downloading the Tor Browser " +"Bundle and extracting the package, you should have a directory with a few " +"files in it. One of the files is an executable called \"Start Tor Browser\" " +"(or \"start-tor-browser\", depending on your operating system)." +msgstr "" + +#. type: Plain text +#: tsum.text:146 +msgid "" +"When you start the Tor Browser Bundle, you will first see Vidalia start up " +"and connect you to the Tor network. After that, you will see a browser " +"confirming that you are now using Tor. This is done by displaying " +"[https://check.torproject.org/](https://check.torproject.org/). You can now " +"browse the Internet through Tor." +msgstr "" + +#. type: Plain text +#: tsum.text:149 +#, no-wrap +msgid "" +"*Please note that it is important that you use the browser that comes\n" +"with the bundle, and not your own browser.*\n" +msgstr "" + +#. type: Plain text +#: tsum.text:155 +msgid "" +"### What to do when Tor does not connect Some users will notice that Vidalia" +" gets stuck when trying to connect to the Tor network. If this happens, make" +" sure that you are connected to the Internet. If you need to connect to a " +"proxy server, see *How to use an open proxy* below." +msgstr "" + +#. type: Plain text +#: tsum.text:160 +msgid "" +"If your normal Internet connection is working, but Tor still can't connect " +"to the network, try the following; open the Vidalia control panel, click on " +"*Message Log* and select the *Advanced* tab. It may be that Tor won't " +"connect because:" +msgstr "" + +#. type: Plain text +#: tsum.text:164 +#, no-wrap +msgid "" +"**Your system clock is off**: Make sure that the date and time on your\n" +"system is correct, and restart Tor. You may need to synchronize your\n" +"system clock with an Internet time server. \n" +msgstr "" + +#. type: Plain text +#: tsum.text:169 +#, no-wrap +msgid "" +"**You are behind a restrictive firewall**: To tell Tor to only try port\n" +"80 and port 443, open the Vidalia control panel, click on *Settings* and\n" +"*Network*, and tick the box that says *My firewall only lets me connect\n" +"to certain ports*. \n" +msgstr "" + +#. type: Plain text +#: tsum.text:173 +#, no-wrap +msgid "" +"**Your anti-virus program is blocking Tor**: Make sure that your\n" +"anti-virus program is not preventing Tor from making network\n" +"connections.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:177 +msgid "" +"If Tor still doesn't work, it's likely that your Internet Service Provider " +"(ISP) is blocking Tor. Very often this can be worked around with **Tor " +"bridges**, hidden relays that aren't as easy to block." +msgstr "" + +#. type: Plain text +#: tsum.text:181 +msgid "" +"If you need help with figuring out why Tor can't connect, send an email to " +"community-support(a)lists.torproject.org and include the relevant parts from " +"the log file." +msgstr "" + +#. type: Plain text +#: tsum.text:189 +msgid "" +"### How to find a bridge To use a bridge, you will first have to locate one;" +" you can either browse to " +"[bridges.torproject.org](https://bridges.torproject.org/), or you can send " +"an email to bridges(a)torproject.org. If you do send an email, please make " +"sure that you write **get bridges** in the body of the email. Without this, " +"you will not get a reply. Note that you need to send this email from either " +"a gmail.com or a yahoo.com address." +msgstr "" + +#. type: Plain text +#: tsum.text:194 +msgid "" +"Configuring more than one bridge address will make your Tor connection more " +"stable, in case some of the bridges become unreachable. There is no " +"guarantee that the bridge you are using now will work tomorrow, so you " +"should make a habit of updating your list of bridges every so often." +msgstr "" + +#. type: Plain text +#: tsum.text:200 +msgid "" +"### How to use a bridge Once you have a set of bridges to use, open the " +"Vidalia control panel, click on *Settings*, *Network* and tick the box that " +"says *My ISP blocks connections to the Tor network*. Enter the bridges in " +"the box below, hit *OK* and start Tor again." +msgstr "" + +#. type: Plain text +#: tsum.text:206 +msgid "" +"### How to use an open proxy If using a bridge does not work, try " +"configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor " +"network. This means even if Tor is blocked by your local network, open " +"proxies can be safely used to connect to the Tor Network and on to the " +"uncensored Internet." +msgstr "" + +#. type: Plain text +#: tsum.text:209 +msgid "" +"The steps below assume you have a functional Tor/Vidalia configuration, and " +"you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." +msgstr "" + +#. type: Bullet: '1. ' +#: tsum.text:221 +msgid "Open the Vidalia control panel, click on *Settings*." +msgstr "" + +#. type: Bullet: '2. ' +#: tsum.text:221 +msgid "Click *Network*. Select *I use a proxy to access the Internet*." +msgstr "" + +#. type: Plain text +#: tsum.text:221 +#, no-wrap +msgid "" +"3. On the *Address* line, enter the open proxy address. This can be a\n" +"hostname or an IP Address.\n" +"4. Enter the port for the proxy.\n" +"5. Generally, you do not need a username and password. If you do,\n" +"enter the information in the proper fields.\n" +"6. Choose the *Type* of proxy you are using, whether HTTP/HTTPS, SOCKS4,\n" +"or SOCKS5.\n" +"7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" +"proxy to access the rest of the Tor network.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:226 +msgid "" +"## Frequently Asked Questions This section will answer some of the most " +"common questions. If your question is not mentioned here, please send an " +"email to community-support(a)lists.torproject.org." +msgstr "" + +#. type: Plain text +#: tsum.text:230 +msgid "" +"### Unable to extract the archive If you are using Windows and find that you" +" cannot extract the archive, download and install " +"[7-Zip](http://www.7-zip.org/)." +msgstr "" + +#. type: Plain text +#: tsum.text:237 +msgid "" +"### What to do with split packages When you request a split package, the " +"parts may arrive out of order. You need to make sure you have received all " +"the parts before you attempt to unpack them. Save all the parts into one " +"directory on your computer, unzip them, and double-click the file that ends " +"in \"..split.part01.exe\" to start the unpacking process." +msgstr "" + +#. type: Plain text +#: tsum.text:241 +msgid "" +"Once the unpacking process has completed, you should see a newly created " +"\".exe\" file in the same directory. Run this file and wait for the Tor " +"Browser Bundle to start." +msgstr "" + +#. type: Plain text +#: tsum.text:245 +msgid "" +"### Vidalia asks for a password You should not have to enter a password when" +" starting Vidalia. If you are prompted for one, you are likely affected by " +"one of these problems:" +msgstr "" + +#. type: Plain text +#: tsum.text:251 +#, no-wrap +msgid "" +"**You are already running Vidalia and Tor**:\n" +"For example, this situation can happen if you installed the Vidalia\n" +"bundle and now you're trying to run the Tor Browser Bundle. In that\n" +"case, you will need to close the old Vidalia and Tor before you can run\n" +"this one.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:258 +#, no-wrap +msgid "" +"**Vidalia crashed, but left Tor running**:\n" +"If the dialog that prompts you for a control password has a Reset\n" +"button, you can click the button and Vidalia will restart Tor with a new\n" +"random control password. If you do not see a Reset button, or if Vidalia\n" +"is unable to restart Tor for you; go into your process or task manager,\n" +"and terminate the Tor process. Then use Vidalia to restart Tor.\n" +msgstr "" + +#. type: Plain text +#: tsum.text:262 +msgid "" +"For more information, see the " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " +"Project website." +msgstr "" + +#. type: Plain text +#: tsum.text:267 +msgid "" +"### Flash does not work For security reasons, Flash, Java, and other plugins" +" are currently disabled for Tor. Plugins operate independently from Firefox " +"and can perform activity on your computer that ruins your anonymity." +msgstr "" + +#. type: Plain text +#: tsum.text:272 +msgid "" +"Most YouTube videos work with HTML5, and it is possible to view these videos" +" over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" +" on the YouTube website before you can use the HTML5 player." +msgstr "" + +#. type: Plain text +#: tsum.text:276 +msgid "" +"Note that the browser will not remember that you joined the trial once you " +"close it, so you will need to re-join the trial the next time you run the " +"Tor Browser Bundle." +msgstr "" + +#. type: Plain text +#: tsum.text:279 +msgid "" +"Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" +"/torbutton-faq.html#noflash) for more information." +msgstr "" + +#. type: Plain text +#: tsum.text:285 +msgid "" +"### I want to use another browser For security reasons, we recommend that " +"you only browse the web through Tor using the Tor Browser Bundle. It is " +"technically possible to use Tor with other browsers, but by doing so you " +"open yourself up to potential attacks." +msgstr "" + +#. type: Plain text +#: tsum.text:289 +msgid "" +"### Why Tor is slow Tor can sometimes be a bit slower than your normal " +"Internet connection. After all, your traffic is sent through many different" +" countries, sometimes across oceans around the world!" +msgstr "" + +

1 0

[stem/master] Putting stem under the LGPL v3
by atagar＠torproject.org 28 Oct '11

28 Oct '11

commit 52be689448931b1eca7de3add345f9aa2d79319f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 27 19:43:45 2011 -0700 Putting stem under the LGPL v3 --- LICENSE | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..65c5ca8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library.

1 0

[stem/master] Merging version constructor and parser
by atagar＠torproject.org 28 Oct '11

28 Oct '11

commit 63a9a5fa524e352c94bab7beabd5052e4972c6c4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 27 20:31:43 2011 -0700 Merging version constructor and parser The version constructor wasn't really useful so merging it with the get_version function to make its usage more intuitive. --- stem/process.py | 4 +- stem/types.py | 66 ++++++++++++++++++++----------------------------- test/unit/version.py | 36 +++++++++++++------------- 3 files changed, 47 insertions(+), 59 deletions(-) diff --git a/stem/process.py b/stem/process.py index 0e22685..4eaf1f7 100644 --- a/stem/process.py +++ b/stem/process.py @@ -18,7 +18,7 @@ from stem.util import system # number of seconds before we time out our attempt to start a tor instance DEFAULT_INIT_TIMEOUT = 90 -# cache for the get_version function +# cache for the get_tor_version function VERSION_CACHE = {} def get_tor_version(tor_cmd = "tor"): @@ -52,7 +52,7 @@ def get_tor_version(tor_cmd = "tor"): if last_line.startswith("Tor version ") and last_line.endswith("."): try: version_str = last_line[12:-1] - VERSION_CACHE[tor_cmd] = stem.types.get_version(version_str) + VERSION_CACHE[tor_cmd] = stem.types.Version(version_str) except ValueError, exc: raise IOError(exc) else: diff --git a/stem/types.py b/stem/types.py index 10b120b..b289921 100644 --- a/stem/types.py +++ b/stem/types.py @@ -12,7 +12,6 @@ ControlMessage - Message from the control socket. |- __str__ - content stripped of protocol formatting +- __iter__ - message components stripped of protocol formatting -get_version - Converts a version string to a Version instance. Version - Tor versioning information. |- __str__ - string representation +- __cmp__ - compares with another Version @@ -202,37 +201,6 @@ class ControlMessage: for _, _, content in self._parsed_content: yield content -def get_version(version_str): - """ - Parses a version string, providing back a types.Version instance. - - Arguments: - version_str (str) - representation of a tor version (ex. "0.2.2.23-alpha") - - Returns: - stem.types.Version instance - - Raises: - ValueError if input isn't a valid tor version - """ - - if not isinstance(version_str, str): - raise ValueError("argument is not a string") - - m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', version_str) - - if m: - major, minor, micro, patch, status = m.groups() - - # The patch and status matches are optional (may be None) and have an extra - # proceeding period or dash if they exist. Stripping those off. - - if patch: patch = int(patch[1:]) - if status: status = status[1:] - - return Version(int(major), int(minor), int(micro), patch, status) - else: raise ValueError("'%s' isn't a properly formatted tor version" % version_str) - class Version: """ Comparable tor version, as per the 'new version' of the version-spec... @@ -247,12 +215,32 @@ class Version: 'alpha', 'beta-dev', etc (None if undefined) """ - def __init__(self, major, minor, micro, patch = None, status = None): - self.major = major - self.minor = minor - self.micro = micro - self.patch = patch - self.status = status + def __init__(self, version_str): + """ + Parses a valid tor version string, for instance "0.1.4" or + "0.2.2.23-alpha". + + Raises: + ValueError if input isn't a valid tor version + """ + + m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', version_str) + + if m: + major, minor, micro, patch, status = m.groups() + + # The patch and status matches are optional (may be None) and have an extra + # proceeding period or dash if they exist. Stripping those off. + + if patch: patch = int(patch[1:]) + if status: status = status[1:] + + self.major = int(major) + self.minor = int(minor) + self.micro = int(micro) + self.patch = patch + self.status = status + else: raise ValueError("'%s' isn't a properly formatted tor version" % version_str) def __str__(self): """ @@ -292,5 +280,5 @@ class Version: return cmp(my_status, other_status) # TODO: version requirements will probably be moved to another module later -REQ_GETINFO_CONFIG_TEXT = get_version("0.2.2.7-alpha") +REQ_GETINFO_CONFIG_TEXT = Version("0.2.2.7-alpha") diff --git a/test/unit/version.py b/test/unit/version.py index 0c4a34a..3200d05 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -12,36 +12,36 @@ class TestVerionFunctions(unittest.TestCase): def test_parsing(self): """ - Tests parsing by the 'get_version' function. + Tests parsing by the Version class constructor. """ # valid versions with various number of compontents to the version - version = stem.types.get_version("0.1.2.3-tag") + version = stem.types.Version("0.1.2.3-tag") self.assert_versions_match(version, 0, 1, 2, 3, "tag") - version = stem.types.get_version("0.1.2.3") + version = stem.types.Version("0.1.2.3") self.assert_versions_match(version, 0, 1, 2, 3, None) - version = stem.types.get_version("0.1.2-tag") + version = stem.types.Version("0.1.2-tag") self.assert_versions_match(version, 0, 1, 2, None, "tag") - version = stem.types.get_version("0.1.2") + version = stem.types.Version("0.1.2") self.assert_versions_match(version, 0, 1, 2, None, None) # checks an empty tag - version = stem.types.get_version("0.1.2.3-") + version = stem.types.Version("0.1.2.3-") self.assert_versions_match(version, 0, 1, 2, 3, "") - version = stem.types.get_version("0.1.2-") + version = stem.types.Version("0.1.2-") self.assert_versions_match(version, 0, 1, 2, None, "") # checks invalid version strings - self.assertRaises(ValueError, stem.types.get_version, "") - self.assertRaises(ValueError, stem.types.get_version, "1.2.3.4nodash") - self.assertRaises(ValueError, stem.types.get_version, "1.2.3.a") - self.assertRaises(ValueError, stem.types.get_version, "1.2.a.4") - self.assertRaises(ValueError, stem.types.get_version, "12.3") - self.assertRaises(ValueError, stem.types.get_version, "1.-2.3") + self.assertRaises(ValueError, stem.types.Version, "") + self.assertRaises(ValueError, stem.types.Version, "1.2.3.4nodash") + self.assertRaises(ValueError, stem.types.Version, "1.2.3.a") + self.assertRaises(ValueError, stem.types.Version, "1.2.a.4") + self.assertRaises(ValueError, stem.types.Version, "12.3") + self.assertRaises(ValueError, stem.types.Version, "1.-2.3") def test_comparison(self): """ @@ -97,8 +97,8 @@ class TestVerionFunctions(unittest.TestCase): second (also checking the inverse). """ - version1 = stem.types.get_version(first_version) - version2 = stem.types.get_version(second_version) + version1 = stem.types.Version(first_version) + version2 = stem.types.Version(second_version) self.assertEqual(version1 > version2, True) self.assertEqual(version1 < version2, False) @@ -107,8 +107,8 @@ class TestVerionFunctions(unittest.TestCase): Asserts that the parsed version of the first version equals the second. """ - version1 = stem.types.get_version(first_version) - version2 = stem.types.get_version(second_version) + version1 = stem.types.Version(first_version) + version2 = stem.types.Version(second_version) self.assertEqual(version1, version2) def assert_string_matches(self, version): @@ -117,5 +117,5 @@ class TestVerionFunctions(unittest.TestCase): matches the input. """ - self.assertEqual(version, str(stem.types.get_version(version))) + self.assertEqual(version, str(stem.types.Version(version)))

1 0

[torbrowser/maint-2.3] update recommended-versions to only recommend 2.2.34-1
by erinn＠torproject.org 28 Oct '11

28 Oct '11

commit 9345bc883114d3c11745def33e9ea02181634109 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 28 16:39:46 2011 +0100 update recommended-versions to only recommend 2.2.34-1 --- build-scripts/recommended-versions | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 4173073..2066e9e 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,14 +1,4 @@ [ -"2.2.33-2-Linux-i686", -"2.2.33-2-Linux-x86_64", -"2.2.33-2-MacOS-i386", -"2.2.33-2-MacOS-x86_64", -"2.2.33-2-Windows-", -"2.2.33-3-Linux-i686", -"2.2.33-3-Linux-x86_64", -"2.2.33-3-MacOS-i386", -"2.2.33-3-MacOS-x86_64", -"2.2.33-3-Windows", "2.2.34-1-Linux-i686", "2.2.34-1-Linux-x86_64", "2.2.34-1-MacOS-i386",

1 0

[torbrowser/maint-2.2] update recommended-versions to only recommend 2.2.34-1
by erinn＠torproject.org 28 Oct '11

28 Oct '11

commit 9345bc883114d3c11745def33e9ea02181634109 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 28 16:39:46 2011 +0100 update recommended-versions to only recommend 2.2.34-1 --- build-scripts/recommended-versions | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 4173073..2066e9e 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,14 +1,4 @@ [ -"2.2.33-2-Linux-i686", -"2.2.33-2-Linux-x86_64", -"2.2.33-2-MacOS-i386", -"2.2.33-2-MacOS-x86_64", -"2.2.33-2-Windows-", -"2.2.33-3-Linux-i686", -"2.2.33-3-Linux-x86_64", -"2.2.33-3-MacOS-i386", -"2.2.33-3-MacOS-x86_64", -"2.2.33-3-Windows", "2.2.34-1-Linux-i686", "2.2.34-1-Linux-x86_64", "2.2.34-1-MacOS-i386",

1 0

[torbrowser/master] update recommended-versions to only recommend 2.2.34-1
by erinn＠torproject.org 28 Oct '11

28 Oct '11

commit 9345bc883114d3c11745def33e9ea02181634109 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 28 16:39:46 2011 +0100 update recommended-versions to only recommend 2.2.34-1 --- build-scripts/recommended-versions | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 4173073..2066e9e 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,14 +1,4 @@ [ -"2.2.33-2-Linux-i686", -"2.2.33-2-Linux-x86_64", -"2.2.33-2-MacOS-i386", -"2.2.33-2-MacOS-x86_64", -"2.2.33-2-Windows-", -"2.2.33-3-Linux-i686", -"2.2.33-3-Linux-x86_64", -"2.2.33-3-MacOS-i386", -"2.2.33-3-MacOS-x86_64", -"2.2.33-3-Windows", "2.2.34-1-Linux-i686", "2.2.34-1-Linux-x86_64", "2.2.34-1-MacOS-i386",

1 0

[orbot/master] updated background image
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit c9fd132b68d8a1afed9b81ee09677704dd6f4a94 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Oct 28 11:25:03 2011 -0400 updated background image --- res/drawable/background.jpg | Bin 33361 -> 0 bytes res/drawable/bgtitanium.jpg | Bin 122818 -> 40884 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/background.jpg b/res/drawable/background.jpg deleted file mode 100644 index 2281f57..0000000 Binary files a/res/drawable/background.jpg and /dev/null differ diff --git a/res/drawable/bgtitanium.jpg b/res/drawable/bgtitanium.jpg index 1455629..1047e4c 100755 Binary files a/res/drawable/bgtitanium.jpg and b/res/drawable/bgtitanium.jpg differ

1 0

[orbot/master] updating project files
by n8fr8＠torproject.org 28 Oct '11

28 Oct '11

commit d6692610e407216eefa80e620ead193110bcec9e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Oct 28 11:25:12 2011 -0400 updating project files --- .classpath | 1 + AndroidManifest.xml | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.classpath b/.classpath index 44abe8e..1182977 100644 --- a/.classpath +++ b/.classpath @@ -4,5 +4,6 @@ <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctrl.jar"/> + <classpathentry kind="lib" path="libs/whispercore.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 781581d..6b7aac3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.1-orbot-alpha-1.0.5.3" android:versionCode="16"> + package="org.torproject.android" android:versionName="tor-0.2.3.6-alpha-orbot-1.0.6" android:versionCode="17"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false"> + <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" + android:label="@string/app_name" android:debuggable="true"> <activity android:name=".Orbot" android:theme="@android:style/Theme.NoTitleBar"> @@ -29,13 +30,13 @@ </intent-filter> </activity> - <activity android:name=".LotsaText"/> - <activity android:name=".Permissions"/> - <activity android:name=".TipsAndTricks"/> - <activity android:name=".ConfigureTransProxy"/> - <activity android:name=".SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".AppManager" android:label="@string/app_name"/> - <activity android:name=".WizardActivity" android:label="@string/app_name"/> + <activity android:name=".wizard.LotsaText"/> + <activity android:name=".wizard.Permissions"/> + <activity android:name=".wizard.TipsAndTricks"/> + <activity android:name=".wizard.ConfigureTransProxy"/> + + <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> + <activity android:name=".settings.AppManager" android:label="@string/app_name"/> <service android:enabled="true" android:name=".service.TorService"

1 0