- tor-commits - lists.torproject.org

[flashproxy/master] Add flashproxy.js.
by dcf＠torproject.org 17 Oct '11

17 Oct '11

commit 038c8f7c215ea1fcf32c61cd76f0ff80f4bb7990 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 19:12:11 2011 -0700 Add flashproxy.js. This is a file that will be hosted at crypto.stanford.edu to make it easy to install the badge on a web page. This script also does the User-Agent detection (to politely disable itself for cell phones) that was formerly done by swfcat itself. --- README | 12 +++--- flashproxy.js | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 6 deletions(-) diff --git a/README b/README index 1a49686..6db4ee0 100644 --- a/README +++ b/README @@ -150,13 +150,13 @@ wait a few minutes. It can take a while to download relay descriptors. == How to put a flash proxy badge on a web page. -Copy swfcat.swf to your server, then paste in this HTML: +Copy swfcat.swf to your server, then paste in this HTML where you want +the badge to appear: + +<script type="text/javascript" src="https://crypto.stanford.edu/flashproxy/flashproxy.js"></script> + +It will be inserted as a span element with the id "flashproxy-badge". -<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> == For developers diff --git a/flashproxy.js b/flashproxy.js new file mode 100644 index 0000000..fea72f9 --- /dev/null +++ b/flashproxy.js @@ -0,0 +1,141 @@ +/* Are circumstances such that we should self-disable and not be a + proxy? We take a best-effort guess as to whether this device runs on + a battery or the data transfer might be expensive. + + Matching mobile User-Agents is complex; but we only need to match + those devices that can also run a recent version of Adobe Flash, + which is a subset of this list: + https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… + + Other resources: + http://www.zytrax.com/tech/web/mobile_ids.html + http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… + http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.… +*/ +function flashproxy_should_disable() +{ + var ua; + + ua = window.navigator.userAgent; + if (ua != null) { + const UA_LIST = [ + /\bmobile\b/i, + /\bandroid\b/i, + /\bopera mobi\b/i, + ]; + + for (var i = 0; i < UA_LIST.length; i++) { + var re = UA_LIST[i]; + + if (ua.match(re)) { + return true; + } + } + } + + return false; +} + +/* Create and return a DOM fragment: +<span id=BADGE_ID> +<a href=FLASHPROXY_INFO_URL> + child +</a> +</span> +*/ +function flashproxy_make_container(child) +{ + const BADGE_ID = "flashproxy-badge"; + const FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; + + var container; + var a; + + container = document.createElement("span"); + container.setAttribute("id", "flashproxy-badge"); + a = document.createElement("a"); + a.setAttribute("href", FLASHPROXY_INFO_URL); + a.appendChild(child) + container.appendChild(a); + + return container; +} + +/* Create and return a DOM fragment: +<object width=WIDTH height=HEIGHT> + <param name="movie" value=SWFCAT_URL> + <param name="flashvars" value=FLASHVARS> + <embed src=SWFCAT_URL width=WIDTH height=HEIGHT flashvars=FLASHVARS></embed> +</object> +*/ +function flashproxy_make_badge() +{ + const WIDTH = 70; + const HEIGHT = 23; + const FLASHVARS = ""; + const SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; + + var object; + var param; + var embed; + + object = document.createElement("object"); + object.setAttribute("width", WIDTH); + object.setAttribute("height", HEIGHT); + + param = document.createElement("param"); + param.setAttribute("name", "movie"); + param.setAttribute("value", SWFCAT_URL); + object.appendChild(param); + param = document.createElement("param"); + param.setAttribute("name", "flashvars"); + param.setAttribute("value", FLASHVARS); + object.appendChild(param); + + embed = document.createElement("embed"); + embed.setAttribute("src", SWFCAT_URL); + embed.setAttribute("width", WIDTH); + embed.setAttribute("height", HEIGHT); + embed.setAttribute("flashvars", FLASHVARS); + object.appendChild(embed); + + return object; +} + +/* Create and return a non-functional placeholder badge DOM fragment: + <img src=BADGE_IMAGE_URL border="0"> +*/ +function flashproxy_make_dummy_badge() +{ + const BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; + + var img; + + img = document.createElement("img"); + img.setAttribute("src", BADGE_IMAGE_URL); + img.setAttribute("border", 0); + + return img; +} + +function flashproxy_badge_insert() +{ + var badge; + var e; + + if (flashproxy_should_disable()) { + badge = flashproxy_make_dummy_badge(); + } else { + badge = flashproxy_make_badge(); + } + + /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to + insert right after the <script> element in the DOM. */ + e = document; + while (e.lastChild && e.lastChild.nodeType == 1) { + e = e.lastChild; + } + e.parentNode.appendChild(flashproxy_make_container(badge)); +} + +flashproxy_badge_insert();

1 0

[flashproxy/master] Regen tor-ignore-bridge-failure.patch and use git a/b prefixes.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit 4d7607575e3bffec622b0983c40b633f5a22d94d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 12:48:17 2011 -0700 Regen tor-ignore-bridge-failure.patch and use git a/b prefixes. --- patches/tor-ignore-bridge-failure.patch | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch index fa50366..dd7290b 100644 --- a/patches/tor-ignore-bridge-failure.patch +++ b/patches/tor-ignore-bridge-failure.patch @@ -2,11 +2,11 @@ This patch causes Tor to ignore bridge reachability failures. This is helpful when the bridge is only intermittently available, as when connecting through a flash proxy. -diff --git src/or/circuitbuild.c src/or/circuitbuild.c -index ac0df91..1794634 100644 ---- src/or/circuitbuild.c -+++ src/or/circuitbuild.c -@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, +diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c +index f7d5524..0ffcf06 100644 +--- a/src/or/circuitbuild.c ++++ b/src/or/circuitbuild.c +@@ -3894,6 +3894,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, int idx = -1; char buf[HEX_DIGEST_LEN+1];

1 0

[flashproxy/master] Make a more user-oriented README.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit 1b3ca42959884dc165e874a5da19c640fcd9712b Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 13:21:10 2011 -0700 Make a more user-oriented README. Start with how to run the client software using the public servers, and put the stuff about compiling SWF and running your own server at the bottom. --- README | 245 +++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 151 insertions(+), 94 deletions(-) diff --git a/README b/README index fa6bf1d..bc09542 100644 --- a/README +++ b/README @@ -16,17 +16,149 @@ There are five main parts. Our terminology for each part is in quotes. 5. A Tor "relay," which is just a normal Tor relay except that its host must also serve a Flash crossdomain policy. -A proxy is capable of connecting to a client in two ways: Using a normal -TCP connection; or over RTMFP, which requires Flash on the client but is -capable of traversing NAT. +The purpose of this project is to create many, generally ephemeral +bridge IP addresses, with the goal of outpacing a censor's ability to +block them. Rather than increasing the number of bridges at static +addresses, we aim to make existing bridges reachable by a larger and +changing pool of addresses. + == Demonstration page +This page has a description of the project; viewing it also turns your +computer into a flash proxy as long as the page is open. (Only if you +have Adobe Flash Player installed.) + https://crypto.stanford.edu/flashproxy/ -== Quick start -=== Building +== Quick start for users + +You must have a version of Tor that supports the Socks4Proxy option. +This means version 0.2.2.32 (released 2011-08-29) or later. + +All the flashproxy programs and source code can be downloaded this way: + git clone https://git.torproject.org/flashproxy.git +But as a user you only need these files: + https://gitweb.torproject.org/flashproxy.git/blob_plain/HEAD:/connector.py + https://gitweb.torproject.org/flashproxy.git/blob_plain/HEAD:/torrc + +There are different ways to get connected, depending on whether you are +able to receive direct TCP connections. The first method is preferred, +if you are able to configure port forwarding or receive direct +connections from the Internet. + +If you don't get a connection within 30 seconds or so, make sure someone +with Flash Player is viewing https://crypto.stanford.edu/flashproxy/. +There aren't yet enough operational proxies that one is available all +the time. + +=== Direct TCP connection + +This is the preferred way to use a flash proxy when it's possible. The +only communication your computer makes with a fixed IP address is +registration with the facilitator: everything else happens over +ephemeral proxies. + +1. Run the connector and instruct it to register with a public + facilitator. + $ python connector.py -f tor-facilitator.bamsoftware.com + By default the connector listens on Internet-facing TCP port 9000. If + you have to use a different port (to get through a firewall, for + example), give it on the command line like this (here using port + 8888): + $ python connector.py -f tor-facilitator.bamsoftware.com 127.0.0.1:9001 :8888 +2. Run Tor using the included torrc file. + $ tor -f flashproxy/torrc + +Watch the logs of connector.py and tor. From connector.py you are +expecting output lines like this: + Remote connection from XXX.XXX.XXX.XXX:YYYYY. + Local connection from 127.0.0.1:ZZZZZ. + Linking 127.0.0.1:ZZZZZ and XXX.XXX.XXX.XXX:YYYYY. +From tor you are looking for: + [notice] Tor has successfully opened a circuit. Looks like client functionality is working. + [notice] Bootstrapped 100%: Done. + +=== Using a public connector + +Rather than running connector.py on your computer, you can use a public +connector. This way is not as realistic because all your Tor traffic +will first go to a public connector, which is at a fixed address and can +be easily blocked. However this is an easy way to try out the system +without having to do port forwarding. + +1. Edit the included torrc file to comment one line and uncomment + another: + # Socks4Proxy 127.0.0.1:9001 + Socks4Proxy tor-facilitator.bamsoftware.com:9999 +2. Run Tor using the included torrc file. + $ tor -f flashproxy/torrc + +=== Using RTMFP + +This method uses a protocol called RTMFP to communicate through a NAT +without port forwarding. However it uses a public server at a fixed +address as an intermediary, so it can be easily blocked. (The +intermediate server is operated by the flash proxy developers, not by +Adobe as is usual with RTMFP.) This method also requires Flash Player on +the Tor client, which the other methods don't. + +1. Download swfcat.swf from + https://crypto.stanford.edu/flashproxy/swfcat.swf + and save it locally. We will assume it is saved at + /home/user/flashproxy/swfcat.swf. +2. Run the connector, without giving it a facilitator, and listening on + local ports only. In this configuration, it is the swfcat.swf program + that communicates with the facilitator, not the connector. + $ ./connector.py 127.0.0.1:9001 127.0.0.1:9002 +3. Open in a browser + file:///home/user/flashproxy/swfcat.swf?client=1&debug=1 +4. Run Tor using the included torrc file. + $ tor -f flashproxy/torrc + +You will see status messages in the swfcat.swf window. + +=== Troubleshooting + +Make sure someone is viewing https://crypto.stanford.edu/flashproxy/, or +another web page with a flash proxy badge on it. + +Sometimes Tor can think that the bridge you reach through a proxy is +unreachable after the proxy is disconnected, even if there is another +proxy immediately available. If you are able to build Tor from source, +try applying the patch patches/tor-ignore-bridge-failure.patch. + $ git apply ~/flashproxy/patches/tor-ignore-bridge-failure.patch +or + $ patch -p1 < ~/flashproxy/patches/tor-ignore-bridge-failure.patch + +If tor hangs at 10% with these messages: + [notice] Bootstrapped 10%: Finishing handshake with directory server. + [notice] no known bridge descriptors running yet; stalling +as a last resort you can try deleting the files in ~/.tor and +/var/lib/tor, and then restarting tor. + +If tor apparently hangs here: + [notice] Bootstrapped 50%: Loading relay descriptors. + [notice] new bridge descriptor '...' (fresh) +wait a few minutes. It can take a while to download relay descriptors. + + +== How to put a flash proxy badge on a web page. + +Copy swfcat.swf to your server, then paste in this 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> + +== For developers + +See design.txt for some more technical information. + +=== Building swfcat.swf Download the (free software) Flex SDK. http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK @@ -36,7 +168,15 @@ To build, run $ make Copy the resulting swfcat.swf file to a web server. -=== Connecting +You can pass swfcat.swf the parameter debug=1 to see lots of debugging +information. + +This is a good tutorial on ActionScript programming with the Flex tools, +with sample code: + http://www.senocular.com/flash/tutorials/as3withmxmlc/ + http://www.senocular.com/flash/tutorials/as3withmxmlc/AS3Flex2b3StarterFile… + +=== Running a relay or facilitator On the Tor relay, run # ./crossdomaind.py @@ -45,52 +185,11 @@ crossdomain policy, but the connector and facilitator have it built in. On the facilitator, run $ ./facilitator.py -r <relay-ip> -The facilitator runs on port 9002 by default. - -In a browser somewhere, open swfcat.swf and pass it a parameters telling it -which facilitator to use, for example - http://www.example.com/swfcat.swf?facilitator=<facilitator-ip>:9002&debug=1 - -There are two ways in which the client can receive connections: over TCP -or RTMFP. TCP doesn't send traffic to anyone other than the facilitator -and the proxy, but it only works if you have a public IP address. RTMFP -coordinates connections using another server (which may be the same as -the facilitator) and works when the client is behind a NAT. - -To connect with TCP, run - $ ./connector.py -f <facilitator-ip> -(If you are running the facilitator locally, be sure to use an external -IP address, not 127.0.0.1.) The connector informs the facilitator that -it wants a connection, then listens on 0.0.0.0:9000 and 127.0.0.1:9001. -The proxy will connect on port 9000 and the local Tor will connect on -9001. - -To connect with RTMFP, run - $ ./connector.py 127.0.0.1:9001 127.0.0.1:9002 -and open in a browser - http://www.example.com/swfcat.swf?client=1&facilitator=<facilitator-ip>:9002 -In this case, it is swfcat running in client mode that registers with -the facilitator. The connector acts to join the local swfcat and the -local Tor client. - -The client needs to be running a version of Tor that supports the -Socks4Proxy configuration. This means version 0.2.2.1-alpha or -later--not the current stable release. - -Start Tor with the following configuration (you can use the included torrc file): - UseBridges 1 - Bridge 127.0.0.1:9001 - Socks4Proxy 127.0.0.1:9001 - -If you see messages like - [notice] Bootstrapped 10%: Finishing handshake with directory server. - [notice] no known bridge descriptors running yet; stalling -try deleting the files in ~/.tor or /var/lib/tor. +You can use "tor1.bamsoftware.com" for <relay-ip>; it is already set up +to serve a crossdomain policy. The facilitator runs on port 9002 by +default. -You will be able to see byte counts flowing in the browser window, and -eventually be able to build a circuit. - -== Installing so as to restart at boot +=== Installing so as to restart at boot The directory init.d contains scripts to start the facilitator and crossdomaind server on CentOS. "make install" copies files to /usr/local/bin. @@ -109,7 +208,7 @@ crossdomaind server on CentOS. "make install" copies files to /usr/local/bin. # chkconfig --add crossdomaind # service crossdomaind start -== Building the Cumulus RTMFP server +=== Building the Cumulus RTMFP server There is a free RTMFP rendezvous server called Cumulus. It is a replacement for the Adobe Cirrus service at rtmfp://p2p.rtmfp.net/. @@ -140,45 +239,3 @@ Follow these steps to install the Cumulus server. You need to open port # cp flashproxy/init.d/cumulus /etc/init.d/cumulus # chkconfig --add cumulus # service cumulus start - -== Rationale - -The purpose of this project is to create many, generally ephemeral -bridge IP addresses, with the goal of outpacing a censor's ability to -block them. Rather than increasing the number of bridges at static -addresses, we aim to make existing bridges reachable by a larger and -changing pool of addresses. - -== Design notes - -Any Tor relay can be used, as long as it also serves a crossdomain -policy. - -Clients register with the facilitator by sending an HTTP message: - POST / HTTP/1.0\r\n - \r\n - client=<ip-addr/rtmfp-id> -The flash proxy also gets a client address over HTTP: - GET / HTTP/1.0\r\n - \r\n -The server sends back address specifications of a client and a relay in -an HTTP respose. - HTTP/1.0 200 OK\r\n - \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 -sample code: - -http://www.senocular.com/flash/tutorials/as3withmxmlc/ -http://www.senocular.com/flash/tutorials/as3withmxmlc/AS3Flex2b3StarterFiles.zip

1 0

[flashproxy/master] Mention that you should not run Flash in your Tor browser.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit aad8ce3c5287c2eed1db7830b2c285830ab83d1f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 16:32:55 2011 -0700 Mention that you should not run Flash in your Tor browser. Just because the RTMFP client connector uses Flash, we don't want to give anyone another excuse to install Flash in the browser they use for Tor. --- README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README b/README index bc09542..7e4dceb 100644 --- a/README +++ b/README @@ -114,6 +114,10 @@ the Tor client, which the other methods don't. $ ./connector.py 127.0.0.1:9001 127.0.0.1:9002 3. Open in a browser file:///home/user/flashproxy/swfcat.swf?client=1&debug=1 + This should *not* be the same browser you use to browse over Tor. You + should not run Flash in your Tor browser. Use a separate Firefox + profile (firefox -no-remote -ProfileManager) or use a separate + browser entirely. 4. Run Tor using the included torrc file. $ tor -f flashproxy/torrc

1 0

[flashproxy/master] Add link to debug version of Flash Player.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit 29c02df8ef1fff012b9e7b3e1f10be7e93fc1538 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 13:57:08 2011 -0700 Add link to debug version of Flash Player. --- README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README b/README index 7e4dceb..1a49686 100644 --- a/README +++ b/README @@ -175,6 +175,10 @@ Copy the resulting swfcat.swf file to a web server. You can pass swfcat.swf the parameter debug=1 to see lots of debugging information. +Adobe makes a debug version of Flash player that raises a window on +errors instead of silently failing, and exposes some logging functions. + http://www.adobe.com/support/flashplayer/downloads.html + This is a good tutorial on ActionScript programming with the Flex tools, with sample code: http://www.senocular.com/flash/tutorials/as3withmxmlc/

1 0

[flashproxy/master] Move patches into a subdirectory.
by dcf＠torproject.org 16 Oct '11

16 Oct '11

commit b6be6a5217212b9455e44aaa3940716484caef27 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 16 12:43:31 2011 -0700 Move patches into a subdirectory. --- README | 2 +- cumulus-no-manage-log.patch | 39 ------------------------------- patches/cumulus-no-manage-log.patch | 39 +++++++++++++++++++++++++++++++ patches/tor-ignore-bridge-failure.patch | 19 +++++++++++++++ tor-ignore-bridge-failure.patch | 19 --------------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/README b/README index 933895a..fa6bf1d 100644 --- a/README +++ b/README @@ -127,7 +127,7 @@ Follow these steps to install the Cumulus server. You need to open port 1935/udp in the firewall. $ git clone git://github.com/OpenRTMFP/Cumulus.git $ cd Cumulus - $ patch -p0 < cumulus-no-manage-log.patch + $ patch -p0 < ~/flashproxy/patches/cumulus-no-manage-log.patch $ cd CumulusLib $ make LIBS=./ # cp libCumulus.so /usr/local/lib diff --git a/cumulus-no-manage-log.patch b/cumulus-no-manage-log.patch deleted file mode 100644 index 810b52d..0000000 --- a/cumulus-no-manage-log.patch +++ /dev/null @@ -1,39 +0,0 @@ -Don't try to re-open log files. This avoids a failure after --daemon -causes a chdir to /. - -diff --git a/CumulusService/sources/main.cpp b/CumulusService/sources/main.cpp -index 891621f..39ea4eb 100644 ---- a/CumulusService/sources/main.cpp -+++ b/CumulusService/sources/main.cpp -@@ -132,7 +132,6 @@ protected: - void dumpHandler(const char* data,int size) { - cout.write(data,size); - _logStream.write(data,size); -- manageLogFile(); - } - - void logHandler(Thread::TID threadId,const std::string& threadName,Priority priority,const char *filePath,long line, const char *text) { -@@ -140,23 +139,6 @@ protected: - _logStream << DateTimeFormatter::format(LocalDateTime(),"%d/%m %H:%M:%S.%c ") - << g_logPriorities[priority-1] << '\t' << threadName << '(' << threadId << ")\t" - << Path(filePath).getFileName() << '[' << line << "] " << text << std::endl; -- manageLogFile(); -- } -- -- void manageLogFile() { -- if(_logFile.getSize()>LOG_SIZE) { -- _logStream.close(); -- int num = 10; -- File file(LOG_FILE(10)); -- if(file.exists()) -- file.remove(); -- while(--num>=0) { -- file = LOG_FILE_VAR(num); -- if(file.exists()) -- file.renameTo(LOG_FILE_VAR(num+1)); -- } -- _logStream.open(LOG_FILE(0),ios::in | ios::ate); -- } - } - - bool onConnection(Client& client) { diff --git a/patches/cumulus-no-manage-log.patch b/patches/cumulus-no-manage-log.patch new file mode 100644 index 0000000..810b52d --- /dev/null +++ b/patches/cumulus-no-manage-log.patch @@ -0,0 +1,39 @@ +Don't try to re-open log files. This avoids a failure after --daemon +causes a chdir to /. + +diff --git a/CumulusService/sources/main.cpp b/CumulusService/sources/main.cpp +index 891621f..39ea4eb 100644 +--- a/CumulusService/sources/main.cpp ++++ b/CumulusService/sources/main.cpp +@@ -132,7 +132,6 @@ protected: + void dumpHandler(const char* data,int size) { + cout.write(data,size); + _logStream.write(data,size); +- manageLogFile(); + } + + void logHandler(Thread::TID threadId,const std::string& threadName,Priority priority,const char *filePath,long line, const char *text) { +@@ -140,23 +139,6 @@ protected: + _logStream << DateTimeFormatter::format(LocalDateTime(),"%d/%m %H:%M:%S.%c ") + << g_logPriorities[priority-1] << '\t' << threadName << '(' << threadId << ")\t" + << Path(filePath).getFileName() << '[' << line << "] " << text << std::endl; +- manageLogFile(); +- } +- +- void manageLogFile() { +- if(_logFile.getSize()>LOG_SIZE) { +- _logStream.close(); +- int num = 10; +- File file(LOG_FILE(10)); +- if(file.exists()) +- file.remove(); +- while(--num>=0) { +- file = LOG_FILE_VAR(num); +- if(file.exists()) +- file.renameTo(LOG_FILE_VAR(num+1)); +- } +- _logStream.open(LOG_FILE(0),ios::in | ios::ate); +- } + } + + bool onConnection(Client& client) { diff --git a/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch new file mode 100644 index 0000000..fa50366 --- /dev/null +++ b/patches/tor-ignore-bridge-failure.patch @@ -0,0 +1,19 @@ +This patch causes Tor to ignore bridge reachability failures. This is +helpful when the bridge is only intermittently available, as when +connecting through a flash proxy. + +diff --git src/or/circuitbuild.c src/or/circuitbuild.c +index ac0df91..1794634 100644 +--- src/or/circuitbuild.c ++++ src/or/circuitbuild.c +@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, + int idx = -1; + char buf[HEX_DIGEST_LEN+1]; + ++ /* Ignore bridge reachability problems. */ ++ if (! succeeded) ++ return 0; ++ + if (! entry_guards) + return 0; + diff --git a/tor-ignore-bridge-failure.patch b/tor-ignore-bridge-failure.patch deleted file mode 100644 index fa50366..0000000 --- a/tor-ignore-bridge-failure.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch causes Tor to ignore bridge reachability failures. This is -helpful when the bridge is only intermittently available, as when -connecting through a flash proxy. - -diff --git src/or/circuitbuild.c src/or/circuitbuild.c -index ac0df91..1794634 100644 ---- src/or/circuitbuild.c -+++ src/or/circuitbuild.c -@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, - int idx = -1; - char buf[HEX_DIGEST_LEN+1]; - -+ /* Ignore bridge reachability problems. */ -+ if (! succeeded) -+ return 0; -+ - if (! entry_guards) - return 0; -

1 0

r25170: {website} index more of the questions at the top of the faq (website/trunk/docs/en)
by Roger Dingledine 16 Oct '11

16 Oct '11

Author: arma Date: 2011-10-16 20:29:39 +0000 (Sun, 16 Oct 2011) New Revision: 25170 Modified: website/trunk/docs/en/faq.wml Log: index more of the questions at the top of the faq Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-10-15 16:20:23 UTC (rev 25169) +++ website/trunk/docs/en/faq.wml 2011-10-16 20:29:39 UTC (rev 25170) @@ -51,11 +51,17 @@ <p>Tor Browser Bundle:</p> <ul> + <li><a href="#TBBBrowserName">Why does TBB's browser window say + Aurora?</a></li> + <li><a href="#TBBFlash">Why can't I view videos on YouTube and other + Flash-based sites?</a></li> <li><a href="#TBBSocksPort">I'm on OSX or Linux and I want to run another application through the Tor launched by Tor Browser Bundle. How do I predict my Socks port?</a></li> <li><a href="#TBBPolipo">I need an HTTP proxy. Where did Polipo go?</a></li> + <li><a href="#TBBOtherExtensions">Can I install other Firefox + extensions?</a></li> <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc with Tor.</a></li> <li><a href="#TBBCloseBrowser">I want to leave Tor Browser Bundle @@ -739,8 +745,8 @@ <hr> <a id="TBBFlash"></a> -<h3><a class="anchor" href="#TBBFlash">I can't view videos on YouTube -and other Flash-based sites. Why?</a></h3> +<h3><a class="anchor" href="#TBBFlash">Why can't I view videos on YouTube +and other Flash-based sites?</a></h3> <p> <a href="https://www.torproject.org/torbutton/torbutton-faq.html.en#noflash">Answer</a>

1 0

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

16 Oct '11

commit 989077f12ca2c98b01819307c2e6879ecb07f5c8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 16 17:15:42 2011 +0000 Update translations for tsum --- cs/tsum.po | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index fbfc41e..6f640b1 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-16 16:03+0000\n" +"PO-Revision-Date: 2011-10-16 17:10+0000\n" "Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -469,8 +469,8 @@ msgid "" "bridges**, hidden relays that aren't as easy to block." msgstr "" "Pokud Tor stále nefunguje, je pravděpodobné že váš provider internetu (ISP) " -"blokuje Tor. To lze velmi často obejít za použití **Tor bridges**, skrytými " -"relayi které není tak jednoduché zablokovat." +"blokuje Tor. To lze velmi často obejít za použití **Tor mostů** (Tor " +"bridges), skrytými relayi které není tak jednoduché zablokovat." #. type: Plain text #: tsum.text:181 @@ -494,6 +494,8 @@ msgid "" "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 "" +"### Jak najít most\n" +"K použití mostu je nejprve potřeba nějaký najít; můžete buď se podívat na [bridges.torproject.org](https://bridges.torproject.org/), nebo pošlete email na <bridges(a)torproject.org>. Pokud budete posílat email, ujistěte se prosím že napíšete **get bridges** do těla emailu, jinak nedostanete odpověď. Tento email je nutno poslat buď z gmail.com nebo yahoo.com adresy." #. type: Plain text #: tsum.text:194 @@ -503,6 +505,10 @@ msgid "" "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 "" +"Nakonfigurování více jak jednoho mostu udělá vaše Tor připojení stabilnější " +"v případě, že některé z mostů se stanou nepřístupné. Není žádná záruka, že " +"most který používate dnes bude fungovat zítra, takže je dobrý nápad jednou " +"za čas seznam mostů obnovovat. " #. type: Plain text #: tsum.text:200 @@ -512,6 +518,8 @@ msgid "" "says *My ISP blocks connections to the Tor network*. Enter the bridges in " "the box below, hit *OK* and start Tor again." msgstr "" +"### Jak používat most\n" +"Jakmile máte nastaven seznam mostů, otevřte ovládací panel Vidalii, klikněte na *Settings*, *Network* a zaškrtněte *My ISP blocks connections to the Tor network*. Pod to zadejte mosty, stiskněte *OK* a spusťte Tor znovu." #. type: Plain text #: tsum.text:206

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 16 Oct '11

16 Oct '11

commit 8705bc008e87cdab6f311b54ce2b712267c9827c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 16 16:37:31 2011 +0000 Update translations for vidalia_installer --- cs/vidalia_cs.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cs/vidalia_cs.po b/cs/vidalia_cs.po index b70e240..18daccf 100644 --- a/cs/vidalia_cs.po +++ b/cs/vidalia_cs.po @@ -1,13 +1,14 @@ # # Translators: +# <gsanky+transifex(a)gmail.com>, 2011. # runasand <runa.sandvik(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: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2010-12-05 20:21+0000\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-10-16 16:06+0000\n" +"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -166,7 +167,7 @@ msgid "" "Polipo is a caching web proxy that increases performance of web browsing " "through Tor." msgstr "" -"Polipo je proxy web, který zvyšuje výkon z prohlížení webových stránek " +"Polipo je webová proxy, která zvyšuje výkon z prohlížení webových stránek " "prostřednictvím Tor." msgctxt "PolipoUninstDesc"

1 0

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

16 Oct '11

commit 9bf8958ca501aad42a0cd5612a2aab624c5eadaf Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 16 16:15:44 2011 +0000 Update translations for tsum --- cs/tsum.po | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/cs/tsum.po b/cs/tsum.po index 82c0a10..fbfc41e 100644 --- a/cs/tsum.po +++ b/cs/tsum.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-15 14:16+0200\n" -"PO-Revision-Date: 2011-10-15 13:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-16 16:03+0000\n" +"Last-Translator: Sanky <gsanky+transifex(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" @@ -373,6 +373,8 @@ msgid "" "files in it. One of the files is an executable called \"Start Tor Browser\" " "(or \"start-tor-browser\", depending on your operating system)." msgstr "" +"### Jak používat Tor Browser Bundle (prohlížečový balíček)\n" +"Po stáhnutí a extrahování Tor Browser Bundle byste měli mít adresář s hrstkou souborů. Uvnitř by měl být spustitelný soubor se jménem \"Start Tor Browser\" (nebo \"start-tor-browser\" podle vašeho operačního systému)." #. type: Plain text #: tsum.text:146 @@ -383,6 +385,11 @@ msgid "" "[https://check.torproject.org/](https://check.torproject.org/). You can now " "browse the Internet through Tor." msgstr "" +"Po spuštění Tor Browser Bundle uvidíte program Vidalia startovat a připojit " +"se k síti Tor. Po té uvidéte prohlížeč potvrzující že nyní používáte Tor. K " +"tomuto ověření se využívá " +"[https://check.torproject.org/](https://check.torproject.org/). Můžete nyní " +"brouzdat Internet skrz Tor." #. type: Plain text #: tsum.text:149 @@ -391,6 +398,8 @@ 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 "" +"*Vezměte prosím na vědomí, že je důležité abyste použili prohlížeč který je " +"součástí balíčků, a ne váš vlastní.*\n" #. type: Plain text #: tsum.text:155 @@ -400,6 +409,8 @@ msgid "" " 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 "" +"### Co dělat když se Tor nepřipojí\n" +"Někteří uživatlé si všimnou, že se Vidalia zasekne při pokusu připojit se k síti Tor. Nastane-li tato situace, ujistěte se že jste připojeni k Internetu. Pokud potřebujete se připojit k proxy serveru, vizte *Jak použít proxy otevřenou proxy* níže." #. type: Plain text #: tsum.text:160 @@ -409,6 +420,10 @@ msgid "" "*Message Log* and select the *Advanced* tab. It may be that Tor won't " "connect because:" msgstr "" +"Pokud vaše normální Internetové připojení funguje, ale Tor se stále nemůže " +"připojit k síti, zkuste následující: otevřte ovládací panel Vidalii, " +"klikněte na *Message Log* a vyberte sekci *Advanced*. Tor se nemusel " +"připojit proto, že:" #. type: Plain text #: tsum.text:164 @@ -418,6 +433,9 @@ msgid "" "system is correct, and restart Tor. You may need to synchronize your\n" "system clock with an Internet time server. \n" msgstr "" +"**Vaše systémové hodiny jdou mimo**: Ujistěte se, že datum a čas ve vašem " +"systému josu správné a restartujte Tor. Možná bude potřeba synchronizovat " +"vaše systémové hodiny s Internetovým časovým serverem.\n" #. type: Plain text #: tsum.text:169 @@ -428,6 +446,9 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" +"**Jste za restriktivním firewallem**: Aby Tor zkoušel jenom porty 80 a 443, " +"otevřte ovládací panel Vidalii, klikněte na *Settings*, *Network*, a " +"zaškrtněte *My firewall only lets me connect to certain ports*.\n" #. type: Plain text #: tsum.text:173 @@ -437,6 +458,8 @@ msgid "" "anti-virus program is not preventing Tor from making network\n" "connections.\n" msgstr "" +"**Váš antivirový program blokuje Tor**: Ujistěte se, že váš antivirus " +"nebrání Toru připojit se k síti.\n" #. type: Plain text #: tsum.text:177 @@ -445,6 +468,9 @@ msgid "" "(ISP) is blocking Tor. Very often this can be worked around with **Tor " "bridges**, hidden relays that aren't as easy to block." msgstr "" +"Pokud Tor stále nefunguje, je pravděpodobné že váš provider internetu (ISP) " +"blokuje Tor. To lze velmi často obejít za použití **Tor bridges**, skrytými " +"relayi které není tak jednoduché zablokovat." #. type: Plain text #: tsum.text:181 @@ -453,6 +479,9 @@ msgid "" "<community-support(a)lists.torproject.org> and include the relevant parts from" " the log file." msgstr "" +"Pokud potřebujete pomoc při zjišťování proč se Tor nemůže připojit, napište " +"email na <community-support(a)lists.torproject.org> a přiložte relevantní " +"části z logů." #. type: Plain text #: tsum.text:189

1 0