May 2015 - tor-commits - lists.torproject.org

[user-manual/master] Add screenshots/make changes based on feedback
by harmony＠torproject.org 21 May '15

21 May '15

commit 98790699b50f0166de032ea5076872ec0b2db40b Author: Harmony <harmony(a)torproject.org> Date: Mon May 18 13:10:25 2015 +0000 Add screenshots/make changes based on feedback --- C/about-tor-browser.page | 4 +- C/bridges.page | 2 +- C/circumvention.page | 35 +++++++---- C/first-time.page | 30 +++++---- C/managing-identities.page | 21 +++++-- C/media/circumvention/bridges.png | Bin 0 -> 177456 bytes C/media/circumvention/configure.png | Bin 0 -> 170221 bytes C/media/circumvention/start_window.png | Bin 0 -> 241282 bytes C/media/first-time/connect.png | Bin 0 -> 170260 bytes C/media/first-time/proxy.png | Bin 0 -> 206062 bytes C/media/first-time/proxy_question.png | Bin 0 -> 212363 bytes C/media/managing-identities/circuit.png | Bin 0 -> 100383 bytes C/media/managing-identities/circuit_full.png | Bin 0 -> 247682 bytes C/media/managing-identities/new_identity.png | Bin 0 -> 228947 bytes C/media/onionsites/onion_url.png | Bin 0 -> 218403 bytes C/media/plugins/noscript_menu.png | Bin 0 -> 75878 bytes C/media/secure-connections/https.png | Bin 0 -> 895331 bytes C/media/security-slider/slider.png | Bin 0 -> 65965 bytes C/media/security-slider/slider_window.png | Bin 0 -> 202254 bytes C/media/troubleshooting/copy_tor_log1.png | Bin 0 -> 249458 bytes C/media/troubleshooting/copy_tor_log2.png | Bin 0 -> 303697 bytes .../copy_tor_log_network_security.png | Bin 0 -> 209566 bytes C/media/troubleshooting/network_security_menu.png | Bin 0 -> 65468 bytes C/media/updating/update1.png | Bin 0 -> 62407 bytes C/media/updating/update2.png | Bin 0 -> 182706 bytes C/media/updating/update3.png | Bin 0 -> 224277 bytes C/media/updating/update4.png | Bin 0 -> 183302 bytes C/onionsites.page | 3 + C/plugins.page | 15 ++--- C/secure-connections.page | 4 +- C/security-slider.page | 41 ++++++------ C/transports.page | 66 ++++++++++---------- C/troubleshooting.page | 26 +++++--- C/uninstalling.page | 8 ++- C/updating.page | 16 +++-- 35 files changed, 164 insertions(+), 107 deletions(-) diff --git a/C/about-tor-browser.page b/C/about-tor-browser.page index 654eebe..97e960a 100644 --- a/C/about-tor-browser.page +++ b/C/about-tor-browser.page @@ -4,7 +4,7 @@ <info> <link type="guide" xref="index" group="#first"/> - <desc>Learn what Tor Browser can do to protect your privacy and anonymity.</desc> + <desc>Learn what Tor Browser can do to protect your privacy and anonymity</desc> </info> <title>About Tor Browser</title> @@ -57,7 +57,7 @@ in the Tor network. The last relay in the circuit (the “exit relay”) then sends the traffic out onto the public Internet. - <media type="image" src="media/how-tor-works.png" /> + <media type="image" width="600" src="media/how-tor-works.png" /> The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, diff --git a/C/bridges.page b/C/bridges.page index 96aeb16..7cf0e92 100644 --- a/C/bridges.page +++ b/C/bridges.page @@ -66,7 +66,7 @@ to obtain bridge addresses in order to use these transports. on a separate line. - <media type="image" src="media/tor-launcher-custom-bridges_en-US.png" /> + <media type="image" width="600" src="media/tor-launcher-custom-bridges_en-US.png" /> Click “Connect”. Using bridges may slow down the connection compared to diff --git a/C/circumvention.page b/C/circumvention.page index de0ba04..eaa92be 100644 --- a/C/circumvention.page +++ b/C/circumvention.page @@ -3,7 +3,7 @@ id="circumvention"> <info> - <desc>What to do if the Tor network is blocked.</desc> + <desc>What to do if the Tor network is blocked</desc> <link type="guide" xref="index" /> </info> @@ -23,19 +23,18 @@ that are currently available. <steps> <item> + <media type="image" width="600" src="media/circumvention/configure.png" /> + + To use pluggable transports, click "Configure" in the Tor Launcher window that appears when you first run Tor Browser. - <media type="image" src="media/tor-launcher-configure_en-US.png" /> - You can also configure pluggable transports while Tor Browser is running, by clicking on the Torbutton menu and selecting “Tor Network Settings”. - -  </item> <item> @@ -43,22 +42,34 @@ that are currently available. Select “yes” when asked if your Internet Service Provider blocks connections to the Tor network. - - <media type="image" src="media/tor-launcher-wizard_en-US.png" /> </item> <item> + <media type="image" width="600" src="media/circumvention/bridges.png" /> + + Select “Connect with provided bridges”. Tor Browser currently has nine - pluggable transport options to choose from. If one fails to get you - online, try selecting a different transport. + pluggable transport options to choose from. See the section below for + advice on which to select. - -  - <media type="image" src="media/tor-launcher-provided-bridges_en-US.png" /> </item> </steps> +</section> +<section id="which-to-use"> +<title>Which transport should I use?</title> + +Each of the transports listed in Tor Launcher’s menu works in a different +way (for more details, see the <link xref="transports">Pluggable +Transports</link> page), and their effectiveness depends on your +individual circumstances. + + +If you are trying to circumvent a blocked connection for the first time, +you should try the different transports in the following order: obfs3, +ScrambleSuit, fte-ipv6, fte, meek-azure, meek-google, meek-amazon, obfs4. + If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link diff --git a/C/first-time.page b/C/first-time.page index 095380b..ef4b239 100644 --- a/C/first-time.page +++ b/C/first-time.page @@ -7,7 +7,7 @@ <desc>Learn how to use Tor Browser for the first time</desc> </info> - <title>Running Tor Browser for the First Time</title> + <title>Running Tor Browser for the first time</title> When you run Tor Browser for the first time, you will see the Tor @@ -18,6 +18,9 @@ <section id="connect"> <title>Connect</title> + <media type="image" width="600" src="media/first-time/connect.png" /> + + In most cases, this option will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Tor’s connection progress. If you are on a relatively @@ -28,11 +31,14 @@ </section> <section id="configure"> <title>Configure</title> - - If you know that your connection is censored, or uses a proxy, you should - select this option. Tor Launcher will take you through a series of - configuration options. - + + <media type="image" width="600" src="media/circumvention/configure.png" /> + + + If you know that your connection is censored, or uses a proxy, you should + select this option. Tor Launcher will take you through a series of + configuration options. + <steps> <item> @@ -51,15 +57,13 @@ this is not necessary. You will usually know if you need to answer “Yes”, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If - your connection does not use a proxy, answer “No”. + your connection does not use a proxy, click “Connect”. + + + <media type="image" width="600" src="media/first-time/proxy_question.png" /> - </item> - <item> - The final screen asks if your connection is behind a firewall that - only allows certain ports. If the answer is “Yes”, enter all the - allowed ports, separated by a comma but no spaces. If the answer is - “No”, click “Connect”. + <media type="image" width="600" src="media/first-time/proxy.png" /> </item> </steps> diff --git a/C/managing-identities.page b/C/managing-identities.page index eb86ed6..814d9aa 100644 --- a/C/managing-identities.page +++ b/C/managing-identities.page @@ -7,7 +7,7 @@ <link type="guide" xref="index" /> </info> -<title>Managing Identities</title> +<title>Managing identities</title> When you connect to a website, it is not only the operators @@ -41,6 +41,14 @@ made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality. + + +<media type="image" width="600" src="media/managing-identities/circuit_full.png" /> + + +You can see a diagram of the circuit that Tor Browser is using for the +current tab in the onion menu. + </section> <section id="logins"> @@ -92,10 +100,12 @@ should bear in mind: <section id="new-identity"> <title>Changing identities and circuits</title> +<media type="image" width="600" src="media/managing-identities/new_identity.png" /> + + Tor Browser features “New Identity” and “New Tor Circuit for this Site” options, located in the Torbutton menu. - <terms> <item> <title>New Identity</title> @@ -104,10 +114,9 @@ options, located in the Torbutton menu. activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing - history, and use new Tor circuits for all connections. Make sure you - have completely finished all activity and downloads before clicking - “New Identity”, as you will not be able to resume them in the new - browser window without starting all over again. + history, and use new Tor circuits for all connections. Tor Browser + will warn you that all activity and downloads will be stopped, so + take this into account before clicking “New Identity”. </item> <item> diff --git a/C/media/circumvention/bridges.png b/C/media/circumvention/bridges.png new file mode 100644 index 0000000..fd16479 Binary files /dev/null and b/C/media/circumvention/bridges.png differ diff --git a/C/media/circumvention/configure.png b/C/media/circumvention/configure.png new file mode 100644 index 0000000..3c5f9f5 Binary files /dev/null and b/C/media/circumvention/configure.png differ diff --git a/C/media/circumvention/start_window.png b/C/media/circumvention/start_window.png new file mode 100644 index 0000000..db1b414 Binary files /dev/null and b/C/media/circumvention/start_window.png differ diff --git a/C/media/first-time/connect.png b/C/media/first-time/connect.png new file mode 100644 index 0000000..f380019 Binary files /dev/null and b/C/media/first-time/connect.png differ diff --git a/C/media/first-time/proxy.png b/C/media/first-time/proxy.png new file mode 100644 index 0000000..9fd2b91 Binary files /dev/null and b/C/media/first-time/proxy.png differ diff --git a/C/media/first-time/proxy_question.png b/C/media/first-time/proxy_question.png new file mode 100644 index 0000000..26e3f10 Binary files /dev/null and b/C/media/first-time/proxy_question.png differ diff --git a/C/media/managing-identities/circuit.png b/C/media/managing-identities/circuit.png new file mode 100644 index 0000000..4a6ed67 Binary files /dev/null and b/C/media/managing-identities/circuit.png differ diff --git a/C/media/managing-identities/circuit_full.png b/C/media/managing-identities/circuit_full.png new file mode 100644 index 0000000..35ef0f2 Binary files /dev/null and b/C/media/managing-identities/circuit_full.png differ diff --git a/C/media/managing-identities/new_identity.png b/C/media/managing-identities/new_identity.png new file mode 100644 index 0000000..38f22c6 Binary files /dev/null and b/C/media/managing-identities/new_identity.png differ diff --git a/C/media/onionsites/onion_url.png b/C/media/onionsites/onion_url.png new file mode 100644 index 0000000..d944c0b Binary files /dev/null and b/C/media/onionsites/onion_url.png differ diff --git a/C/media/plugins/noscript_menu.png b/C/media/plugins/noscript_menu.png new file mode 100644 index 0000000..c9b0055 Binary files /dev/null and b/C/media/plugins/noscript_menu.png differ diff --git a/C/media/secure-connections/https.png b/C/media/secure-connections/https.png new file mode 100644 index 0000000..7fd9cc9 Binary files /dev/null and b/C/media/secure-connections/https.png differ diff --git a/C/media/security-slider/slider.png b/C/media/security-slider/slider.png new file mode 100644 index 0000000..7e47965 Binary files /dev/null and b/C/media/security-slider/slider.png differ diff --git a/C/media/security-slider/slider_window.png b/C/media/security-slider/slider_window.png new file mode 100644 index 0000000..8db19e8 Binary files /dev/null and b/C/media/security-slider/slider_window.png differ diff --git a/C/media/troubleshooting/copy_tor_log1.png b/C/media/troubleshooting/copy_tor_log1.png new file mode 100644 index 0000000..6d1b617 Binary files /dev/null and b/C/media/troubleshooting/copy_tor_log1.png differ diff --git a/C/media/troubleshooting/copy_tor_log2.png b/C/media/troubleshooting/copy_tor_log2.png new file mode 100644 index 0000000..5feada4 Binary files /dev/null and b/C/media/troubleshooting/copy_tor_log2.png differ diff --git a/C/media/troubleshooting/copy_tor_log_network_security.png b/C/media/troubleshooting/copy_tor_log_network_security.png new file mode 100644 index 0000000..b70841f Binary files /dev/null and b/C/media/troubleshooting/copy_tor_log_network_security.png differ diff --git a/C/media/troubleshooting/network_security_menu.png b/C/media/troubleshooting/network_security_menu.png new file mode 100644 index 0000000..9996e7f Binary files /dev/null and b/C/media/troubleshooting/network_security_menu.png differ diff --git a/C/media/updating/update1.png b/C/media/updating/update1.png new file mode 100644 index 0000000..dc1a569 Binary files /dev/null and b/C/media/updating/update1.png differ diff --git a/C/media/updating/update2.png b/C/media/updating/update2.png new file mode 100644 index 0000000..e095024 Binary files /dev/null and b/C/media/updating/update2.png differ diff --git a/C/media/updating/update3.png b/C/media/updating/update3.png new file mode 100644 index 0000000..3d3dab8 Binary files /dev/null and b/C/media/updating/update3.png differ diff --git a/C/media/updating/update4.png b/C/media/updating/update4.png new file mode 100644 index 0000000..12e329f Binary files /dev/null and b/C/media/updating/update4.png differ diff --git a/C/onionsites.page b/C/onionsites.page index 809f099..0b1bd70 100644 --- a/C/onionsites.page +++ b/C/onionsites.page @@ -45,6 +45,9 @@ non-private web: <section id="access"> <title>How to access an onionsite</title> +<media type="image" width="600" src="media/onionsites/onion_url.png" /> + + Just like any other website, you will need to know the address of an onionsite in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by “.onion”. diff --git a/C/plugins.page b/C/plugins.page index 9d7e9c2..7e2486e 100644 --- a/C/plugins.page +++ b/C/plugins.page @@ -40,15 +40,16 @@ Tor Browser includes an add-on called NoScript, accessed through the “S” icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely. - + +<media type="image" width="400" src="media/plugins/noscript_menu.png" /> + Users who require a high degree of security in their web browsing should -select “Forbid Scripts Globally” from the NoScript drop-down menu. This -setting is also activated by default when Tor Browser’s <link -xref='security-slider'>Security Slider</link> is set to “Medium-High” -(for non-HTTPS websites) or “High” (for all websites). However, disabling -JavaScript will prevent many websites from displaying correctly, so Tor -Browser’s default setting is to allow all websites to run scripts. +set Tor Browser’s <link xref='security-slider'>Security Slider</link> to +“Medium-High” (which disables JavaScript for non-HTTPS websites) or “High” +(which does so for all websites). However, disabling JavaScript will +prevent many websites from displaying correctly, so Tor Browser’s default +setting is to allow all websites to run scripts. </section> diff --git a/C/secure-connections.page b/C/secure-connections.page index bc95244..d85e764 100644 --- a/C/secure-connections.page +++ b/C/secure-connections.page @@ -20,7 +20,9 @@ connection is encrypted, the address will begin with “https://”, rather than “http://”. - + + <media type="image" width="700" src="media/secure-connections/https.png" /> + The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption: diff --git a/C/security-slider.page b/C/security-slider.page index 17abe9d..bda2638 100644 --- a/C/security-slider.page +++ b/C/security-slider.page @@ -20,6 +20,9 @@ you require. <section id="access"> <title>Accessing the Security Slider</title> +<media type="image" width="400" src="media/security-slider/slider.png" /> + + The Security Slider is located in Torbutton’s “Privacy and Security Settings” menu. @@ -28,25 +31,22 @@ Settings” menu. <section id="levels"> <title>Security Levels</title> +<media type="image" width="600" src="media/security-slider/slider_window.png" /> + + Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks. - <terms> <item> - <title>Low</title> - - At this level, all browser features are enabled. This is the most - usable option. - - </item> - <item> - <title>Medium-Low</title> + <title>High</title> At this level, HTML5 video and audio media become click-to-play via - NoScript; some <link xref='plugins'>JavaScript</link> performance - optimizations are disabled, causing some websites to run more slowly; - and some mathematical equations may not display properly. + NoScript; all JavaScript performance optimizations are disabled; some + mathematical equations may not display properly; some font rendering + features are disabled; some types of image are disabled; Javascript + is disabled by default on all sites; most video and audio formats are + disabled; and some fonts and icons may not display correctly. </item> <item> @@ -61,14 +61,19 @@ disable certain browser features to protect against possible attacks. </item> <item> - <title>High</title> + <title>Medium-Low</title> At this level, HTML5 video and audio media become click-to-play via - NoScript; all JavaScript performance optimizations are disabled; some - mathematical equations may not display properly; some font rendering - features are disabled; some types of image are disabled; Javascript - is disabled by default on all sites; most video and audio formats are - disabled; and some fonts and icons may not display correctly. + NoScript; some <link xref='plugins'>JavaScript</link> performance + optimizations are disabled, causing some websites to run more slowly; + and some mathematical equations may not display properly. + + </item> + <item> + <title>Low</title> + + At this level, all browser features are enabled. This is the most + usable option. </item> </terms> diff --git a/C/transports.page b/C/transports.page index 03dc89b..b7e652d 100644 --- a/C/transports.page +++ b/C/transports.page @@ -26,27 +26,28 @@ being developed. <tr> <td> - obfs2 - + obfs3 + </td> <td> - Censors have learned how to identify obfs2 bridges. This transport - is deprecated, and you should not use it. + obfs3 makes Tor traffic look random, so that it does not look + like Tor or any other protocol. obfs3 bridges will work in most + places. </td> </tr> <tr> <td> - obfs3 + obfs4 </td> <td> - obfs3 disguises Tor traffic as random noise. obfs3 bridges work - almost everywhere, though some may have been identified and - blocked by censors. + obfs4 makes Tor traffic look random like obfs3, and also prevents + censors from finding bridges by Internet scanning. obfs4 bridges + are less likely to be blocked than obfs3 bridges. </td> </tr> @@ -58,52 +59,53 @@ being developed. </td> <td> - Scramblesuit is an additional tool for the obfs3 transport that - tries to stop censors from identifying bridges through active - probing. + ScrambleSuit is similar to obfs4 but has a different set + of bridges. </td> </tr> <tr> <td> - obfs4 + FTE </td> <td> - obfs4 offers the same features as Scramblesuit, but uses different - cryptographic and authentication methods that result in improved - speed. + FTE (format-transforming encryption) disguises Tor traffic as + ordinary web (HTTP) traffic. </td> </tr> <tr> - <td> - - meek - - </td> - <td> - - Rather than using bridges, meek works by making your Tor traffic - seem as though it is destined for a major website that a censor - cannot block without disrupting a lot of other activity on the - network. - - </td> + <td> + + meek + + </td> + <td> + + These transports all make it look + like you are browsing a major web site instead of using Tor. + meek-amazon makes it look like you are using Amazon Web + Services; meek-azure makes it look like you are using a + Microsoft web site; and meek-google makes it look like you are + using Google search. + + </td> </tr> <tr> <td> - FTE + Flashproxy </td> <td> - Format-Transforming Encryption disguises Tor traffic as web (HTTP) - traffic or other types of internet traffic. FTE bridges are - effective, but in limited supply. + Flashproxy is for advanced users. It sends your traffic + through other peoples’ web browsers. To set it up, you need to + read the <a href="https://trac.torproject.org/projects/tor/wiki/FlashProxyHowto">flash + proxy how-to</a>. </td> </tr> diff --git a/C/troubleshooting.page b/C/troubleshooting.page index 952a0a5..4bcd90f 100644 --- a/C/troubleshooting.page +++ b/C/troubleshooting.page @@ -3,7 +3,7 @@ id="troubleshooting"> <info> - <desc>What to do if Tor Browser doesn’t work.</desc> + <desc>What to do if Tor Browser doesn’t work</desc> <link type="guide" xref="index" group="#last" /> </info> @@ -15,7 +15,7 @@ after running the program, and clicking the “Connect” button if you are using it for the first time. -<media type="image" src="media/tor-launcher-connect_en-US.png" /> +<media type="image" width="600" src="media/first-time/connect.png" /> <section id="no-connection"> <title>Quick fixes</title> @@ -99,21 +99,31 @@ the problem. To copy the Tor log, either: <item> click the button labelled “Copy Tor Log To Clipboard” that appears in - the dialog window while Tor Browser is connecting to the network, or + the Tor Launcher window, or + + + <media type="image" width="600" src="media/troubleshooting/copy_tor_log1.png" /> </item> <item> if Tor Browser is already open, click on the Torbutton icon (the small - green onion at the top left of the screen), then “Open Network + green onion at the top left of the screen), then “Tor Network Settings”, then “Copy Tor Log To Clipboard”. + + <media type="image" width="600" src="media/troubleshooting/network_security_menu.png" /> + + </item> + <item> + + You can now paste the Tor log into your support request. + + + <media type="image" width="600" src="media/troubleshooting/copy_tor_log2.png" /> + </item> </list> - -You can now paste the Tor log into your support request. - - </section> </page> diff --git a/C/uninstalling.page b/C/uninstalling.page index 4deef86..eab010e 100644 --- a/C/uninstalling.page +++ b/C/uninstalling.page @@ -3,7 +3,7 @@ id="uninstalling"> <info> - <desc>How to remove Tor Browser from your system.</desc> + <desc>How to remove Tor Browser from your system</desc> <link type="guide" xref="index" group="#last" /> </info> @@ -21,8 +21,10 @@ Removing Tor Browser from your system is simple: <steps> <item> - Locate your Tor Browser folder. The default location is your Desktop. -  + + Locate your Tor Browser folder. The default location on Windows is the Desktop; + on Mac OS X it is the Applications folder. + </item> <item> Delete the Tor Browser folder. diff --git a/C/updating.page b/C/updating.page index 1298893..c950f9e 100644 --- a/C/updating.page +++ b/C/updating.page @@ -22,26 +22,34 @@ and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually. - - <section id="automatic"> <title>Updating Tor Browser automatically</title> <steps> <item> + <media type="image" width="400" src="media/updating/update1.png" /> + + When you are prompted to update Tor Browser, click on the Torbutton icon, then select “Check for Tor Browser Update”. </item> <item> + <media type="image" width="600" src="media/updating/update3.png" /> + + When Tor Browser has finished checking for updates, click on the - “Update” button and wait for the update to download and install. + “Update” button. </item> <item> - Restart Tor Browser. You will now be running the latest version. + <media type="image" width="600" src="media/updating/update4.png" /> + + + Wait for the update to download and install, then restart Tor + Browser. You will now be running the latest version. </item> </steps>

1 0

[tor/master] Merge remote-tracking branch 'yawning/bug16052a_027'
by nickm＠torproject.org 21 May '15

21 May '15

commit eb7f4d0059d447f79362be22c9c0c3c66ec85857 Merge: b668d30 712bf06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:48:52 2015 -0400 Merge remote-tracking branch 'yawning/bug16052a_027' changes/feature16052 | 5 +++ doc/tor.1.txt | 10 ++++++ src/or/circuituse.c | 27 +++++++++++----- src/or/config.c | 2 ++ src/or/connection_edge.c | 2 ++ src/or/control.c | 21 +++++++++++- src/or/or.h | 3 ++ src/or/rendservice.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- src/or/rendservice.h | 2 ++ 9 files changed, 141 insertions(+), 10 deletions(-)

1 0

[tor/master] Add support for 'HiddenServiceMaxStream' to 'ADD_ONION'.
by nickm＠torproject.org 21 May '15

21 May '15

commit 712bf069781d7a6336501aab628f62ada4f4c4d7 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed May 20 17:41:27 2015 +0000 Add support for 'HiddenServiceMaxStream' to 'ADD_ONION'. Done as a separate commit to ease backporting the tunables to 0.2.6.x. --- src/or/control.c | 21 ++++++++++++++++++++- src/or/rendservice.c | 26 +++++++++++++++++++++++++- src/or/rendservice.h | 2 ++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 4eeb897..746dfff 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3566,9 +3566,12 @@ handle_control_add_onion(control_connection_t *conn, smartlist_t *port_cfgs = smartlist_new(); int discard_pk = 0; int detach = 0; + int max_streams = 0; + int max_streams_close_circuit = 0; for (size_t i = 1; i < arg_len; i++) { static const char *port_prefix = "Port="; static const char *flags_prefix = "Flags="; + static const char *max_s_prefix = "MaxStreams="; const char *arg = smartlist_get(args, i); if (!strcasecmpstart(arg, port_prefix)) { @@ -3582,15 +3585,27 @@ handle_control_add_onion(control_connection_t *conn, goto out; } smartlist_add(port_cfgs, cfg); + } else if (!strcasecmpstart(arg, max_s_prefix)) { + /* "MaxStreams=[0..65535]". */ + const char *max_s_str = arg + strlen(max_s_prefix); + int ok = 0; + max_streams = (int)tor_parse_long(max_s_str, 10, 0, 65535, &ok, NULL); + if (!ok) { + connection_printf_to_buf(conn, "512 Invalid MaxStreams\r\n"); + goto out; + } } else if (!strcasecmpstart(arg, flags_prefix)) { /* "Flags=Flag[,Flag]", where Flag can be: * * 'DiscardPK' - If tor generates the keypair, do not include it in * the response. * * 'Detach' - Do not tie this onion service to any particular control * connection. + * * 'MaxStreamsCloseCircuit' - Close the circuit if MaxStreams is + * exceeded. */ static const char *discard_flag = "DiscardPK"; static const char *detach_flag = "Detach"; + static const char *max_s_close_flag = "MaxStreamsCloseCircuit"; smartlist_t *flags = smartlist_new(); int bad = 0; @@ -3607,6 +3622,8 @@ handle_control_add_onion(control_connection_t *conn, discard_pk = 1; } else if (!strcasecmp(flag, detach_flag)) { detach = 1; + } else if (!strcasecmp(flag, max_s_close_flag)) { + max_streams_close_circuit = 1; } else { connection_printf_to_buf(conn, "512 Invalid 'Flags' argument: %s\r\n", @@ -3652,7 +3669,9 @@ handle_control_add_onion(control_connection_t *conn, * regardless of success/failure. */ char *service_id = NULL; - int ret = rend_service_add_ephemeral(pk, port_cfgs, &service_id); + int ret = rend_service_add_ephemeral(pk, port_cfgs, max_streams, + max_streams_close_circuit, + &service_id); port_cfgs = NULL; /* port_cfgs is now owned by the rendservice code. */ switch (ret) { case RSAE_OKAY: diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 5d2225e..0329d70 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -266,6 +266,23 @@ rend_add_service(rend_service_t *service) service->intro_nodes = smartlist_new(); + if (service->max_streams_per_circuit < 0) { + log_warn(LD_CONFIG, "Hidden service (%s) configured with negative max " + "streams per circuit; ignoring.", + rend_service_escaped_dir(service)); + rend_service_free(service); + return -1; + } + + if (service->max_streams_close_circuit < 0 || + service->max_streams_close_circuit > 1) { + log_warn(LD_CONFIG, "Hidden service (%s) configured with invalid " + "max streams handling; ignoring.", + rend_service_escaped_dir(service)); + rend_service_free(service); + return -1; + } + if (service->auth_type != REND_NO_AUTH && smartlist_len(service->clients) == 0) { log_warn(LD_CONFIG, "Hidden service (%s) with client authorization but no " @@ -792,7 +809,10 @@ rend_config_services(const or_options_t *options, int validate_only) return 0; } -/** Add the ephemeral service pk/ports if possible. +/** Add the ephemeral service pk/ports if possible, with + * max_streams_per_circuit streams allowed per rendezvous circuit, + * and circuit closure on max streams being exceeded set by + * max_streams_close_circuit. * * Regardless of sucess/failure, callers should not touch pk/ports after * calling this routine, and may assume that correct cleanup has been done @@ -803,6 +823,8 @@ rend_config_services(const or_options_t *options, int validate_only) rend_service_add_ephemeral_status_t rend_service_add_ephemeral(crypto_pk_t *pk, smartlist_t *ports, + int max_streams_per_circuit, + int max_streams_close_circuit, char **service_id_out) { *service_id_out = NULL; @@ -816,6 +838,8 @@ rend_service_add_ephemeral(crypto_pk_t *pk, s->ports = ports; s->intro_period_started = time(NULL); s->n_intro_points_wanted = NUM_INTRO_POINTS_DEFAULT; + s->max_streams_per_circuit = max_streams_per_circuit; + s->max_streams_close_circuit = max_streams_close_circuit; if (rend_service_derive_key_digests(s) < 0) { rend_service_free(s); return RSAE_BADPRIVKEY; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index ec783d5..b540d2c 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -117,6 +117,8 @@ typedef enum { } rend_service_add_ephemeral_status_t; rend_service_add_ephemeral_status_t rend_service_add_ephemeral(crypto_pk_t *pk, smartlist_t *ports, + int max_streams_per_circuit, + int max_streams_close_circuit, char **service_id_out); int rend_service_del_ephemeral(const char *service_id);

1 0

[tor/master] Add "HiddenServiceMaxStreams" as a per-HS tunable.
by nickm＠torproject.org 21 May '15

21 May '15

commit db7bde08be59398488624bc377d1d5318182ee45 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed May 20 17:33:59 2015 +0000 Add "HiddenServiceMaxStreams" as a per-HS tunable. When set, this limits the maximum number of simultaneous streams per rendezvous circuit on the server side of a HS, with further RELAY_BEGIN cells being silently ignored. This can be modified via "HiddenServiceMaxStreamsCloseCircuit", which if set will cause offending rendezvous circuits to be torn down instead. Addresses part of #16052. --- changes/feature16052 | 5 +++++ doc/tor.1.txt | 10 +++++++++ src/or/circuituse.c | 27 ++++++++++++++++------- src/or/config.c | 2 ++ src/or/connection_edge.c | 2 ++ src/or/or.h | 3 +++ src/or/rendservice.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 94 insertions(+), 8 deletions(-) diff --git a/changes/feature16052 b/changes/feature16052 new file mode 100644 index 0000000..cd09b58 --- /dev/null +++ b/changes/feature16052 @@ -0,0 +1,5 @@ + o Minor features (hidden service): + - Add the new options "HiddenServiceMaxStreams" and + "HiddenServiceMaxStreamsCloseCircuit" to allow hidden services to limit + the maximum number of simultaneous streams per circuit, and optionally + tear down the circuit when the limit is exceeded. Part of ticket 16052. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2bb5f94..13f2bdd 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2149,6 +2149,16 @@ The following options are used to configure a hidden service. not an authorization mechanism; it is instead meant to be a mild inconvenience to port-scanners.) (Default: 0) +[[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: + The maximum number of simultaneous streams (connections) per rendezvous + circuit. (Setting this to 0 will allow an unlimited number of simultanous + streams.) (Default: 0) + +[[HiddenServiceMaxStreamsCloseCircuit]] **HiddenServiceMaxStreamsCloseCircuit** **0**|**1**:: + If set to 1, then exceeding **HiddenServiceMaxStreams** will cause the + offending rendezvous circuit to be torn down, as opposed to stream creation + requests that exceed the limit being silently ignored. (Default: 0) + [[RendPostPeriod]] **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Every time the specified period elapses, Tor uploads any rendezvous service descriptors to the directory servers. This information is also diff --git a/src/or/circuituse.c b/src/or/circuituse.c index b54a4d2..a429a7d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1189,17 +1189,28 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ); + int removed = 0; if (conn == origin_circ->p_streams) { origin_circ->p_streams = conn->next_stream; - return; + removed = 1; + } else { + for (prevconn = origin_circ->p_streams; + prevconn && prevconn->next_stream && prevconn->next_stream != conn; + prevconn = prevconn->next_stream) + ; + if (prevconn && prevconn->next_stream) { + prevconn->next_stream = conn->next_stream; + removed = 1; + } } - - for (prevconn = origin_circ->p_streams; - prevconn && prevconn->next_stream && prevconn->next_stream != conn; - prevconn = prevconn->next_stream) - ; - if (prevconn && prevconn->next_stream) { - prevconn->next_stream = conn->next_stream; + if (removed) { + /* If the stream was removed, and it was a rend stream, decrement the + * number of streams on the circuit associated with the rend service. + */ + if (circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) { + tor_assert(origin_circ->rend_data); + origin_circ->rend_data->nr_streams--; + } return; } } else { diff --git a/src/or/config.c b/src/or/config.c index 1030448..1c04578 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -286,6 +286,8 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceAuthorizeClient",LINELIST_S,RendConfigLines, NULL), VAR("HiddenServiceAllowUnknownPorts",LINELIST_S, RendConfigLines, NULL), + VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL), + VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL), V(HiddenServiceStatistics, BOOL, "0"), V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index cc6e3d7..c63c350 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2860,6 +2860,8 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) origin_circ->p_streams = n_stream; assert_circuit_ok(circ); + origin_circ->rend_data->nr_streams++; + connection_exit_connect(n_stream); /* For path bias: This circuit was used successfully */ diff --git a/src/or/or.h b/src/or/or.h index 5bb080f..af34967 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -818,6 +818,9 @@ typedef struct rend_data_t { /** List of HSDir fingerprints on which this request has been sent to. * This contains binary identity digest of the directory. */ smartlist_t *hsdirs_fp; + + /** Number of streams associated with this rendezvous circuit. */ + int nr_streams; } rend_data_t; /** Time interval for tracking replays of DH public keys received in diff --git a/src/or/rendservice.c b/src/or/rendservice.c index daca4cc..5d2225e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -147,6 +147,13 @@ typedef struct rend_service_t { /** If true, we don't close circuits for making requests to unsupported * ports. */ int allow_unknown_ports; + /** The maximum number of simultanious streams-per-circuit that are allowed + * to be established, or 0 if no limit is set. + */ + int max_streams_per_circuit; + /** If true, we close circuits that exceed the max_streams_per_circuit + * limit. */ + int max_streams_close_circuit; } rend_service_t; /** Returns a escaped string representation of the service, s. @@ -539,6 +546,33 @@ rend_config_services(const or_options_t *options, int validate_only) log_info(LD_CONFIG, "HiddenServiceDirGroupReadable=%d for %s", service->dir_group_readable, service->directory); + } else if (!strcasecmp(line->key, "HiddenServiceMaxStreams")) { + service->max_streams_per_circuit = (int)tor_parse_long(line->value, + 10, 0, 65535, &ok, NULL); + if (!ok) { + log_warn(LD_CONFIG, + "HiddenServiceMaxStreams should be between 0 and %d, not %s", + 65535, line->value); + rend_service_free(service); + return -1; + } + log_info(LD_CONFIG, + "HiddenServiceMaxStreams=%d for %s", + service->max_streams_per_circuit, service->directory); + } else if (!strcasecmp(line->key, "HiddenServiceMaxStreamsCloseCircuit")) { + service->max_streams_close_circuit = (int)tor_parse_long(line->value, + 10, 0, 1, &ok, NULL); + if (!ok) { + log_warn(LD_CONFIG, + "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, not %s", + line->value); + rend_service_free(service); + return -1; + } + log_info(LD_CONFIG, + "HiddenServiceMaxStreamsCloseCircuit=%d for %s", + (int)service->max_streams_close_circuit, service->directory); + } else if (!strcasecmp(line->key, "HiddenServiceAuthorizeClient")) { /* Parse auth type and comma-separated list of client names and add a * rend_authorized_client_t for each client to the service's list @@ -3795,6 +3829,25 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, serviceid, (unsigned)circ->base_.n_circ_id); return -2; } + if (service->max_streams_per_circuit > 0) { + /* Enforce the streams-per-circuit limit, and refuse to provide a + * mapping if this circuit will exceed the limit. */ +#define MAX_STREAM_WARN_INTERVAL 600 + static struct ratelim_t stream_ratelim = + RATELIM_INIT(MAX_STREAM_WARN_INTERVAL); + if (circ->rend_data->nr_streams >= service->max_streams_per_circuit) { + log_fn_ratelim(&stream_ratelim, LOG_WARN, LD_REND, + "Maximum streams per circuit limit reached on rendezvous " + "circuit %u; %s. Circuit has %d out of %d streams.", + (unsigned)circ->base_.n_circ_id, + service->max_streams_close_circuit ? + "closing circuit" : + "ignoring open stream request", + circ->rend_data->nr_streams, + service->max_streams_per_circuit); + return service->max_streams_close_circuit ? -2 : -1; + } + } matching_ports = smartlist_new(); SMARTLIST_FOREACH(service->ports, rend_service_port_config_t *, p, {

1 0

[tor/master] fwd-port 0.2.6.8 changelog
by nickm＠torproject.org 21 May '15

21 May '15

commit b668d3017b205527edbcc7360109d0785046b465 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:42:16 2015 -0400 fwd-port 0.2.6.8 changelog --- ChangeLog | 20 ++++++++++++++++++++ ReleaseNotes | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/ChangeLog b/ChangeLog index c79a399..651d317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ Changes in version 0.2.7.2-alpha - 2015-0?-?? +Changes in version 0.2.6.8 - 2015-05-21 + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. Changes in version 0.2.7.1-alpha - 2015-05-12 diff --git a/ReleaseNotes b/ReleaseNotes index 68ce114..99880ce 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,28 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.6.8 - 2015-05-21 + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. + + Changes in version 0.2.6.7 - 2015-04-06 Tor 0.2.6.7 fixes two security issues that could be used by an attacker to crash hidden services, or crash clients visiting hidden

1 0

[tor/release-0.2.6] ChangeLog->releasenotes
by nickm＠torproject.org 21 May '15

21 May '15

commit 2fe3afccb6505dbe0a94767d17be2280226c258e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:42:03 2015 -0400 ChangeLog->releasenotes --- ReleaseNotes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index ff32d96..d026d42 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,27 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.6.8 - 2015-05-21 + Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and + fixes an authority-side bug in assigning the HSDir flag. All directory + authorities should upgrade. + + o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): + - Revert commit that made directory authorities assign the HSDir + flag to relay without a DirPort; this was bad because such relays + can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix + on tor-0.2.6.3-alpha. + + o Minor bugfixes (hidden service, backport from 0.2.7.1-alpha): + - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells on + a client authorized hidden service. Fixes bug 15823; bugfix + on 0.2.1.6-alpha. + + o Minor features (geoip): + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 + Country database. + Changes in version 0.2.6.7 - 2015-04-06 Tor 0.2.6.7 fixes two security issues that could be used by an

1 0

[tor/release-0.2.6] whoops, note the release date
by nickm＠torproject.org 21 May '15

21 May '15

commit 2a38a3f92b7edd8e4de8039005df2d524a8ff486 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 21 10:40:33 2015 -0400 whoops, note the release date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 25ab6e4..8135c78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.6.8 - 2015-05-2? +Changes in version 0.2.6.8 - 2015-05-21 Tor 0.2.6.8 fixes a bit of dodgy code in parsing INTRODUCE2 cells, and fixes an authority-side bug in assigning the HSDir flag. All directory authorities should upgrade.

1 0

[tor-browser-bundle/master] Bug 16083: Update comment in start-tor-browser
by gk＠torproject.org 21 May '15

21 May '15

commit 30895033d3dc497cf38bfafdcf4aae323327d15f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 21 12:50:24 2015 +0000 Bug 16083: Update comment in start-tor-browser Thanks, cypherpunk. --- RelativeLink/start-tor-browser | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 940ec96..638c0c0 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -308,8 +308,8 @@ EOF # TOR_CONTROL_PASSWD='"secret"' # # Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by TorButtom to authenticate to Tor's ControlPort, and -# is necessary for using TBB with a with a system-installed Tor. +# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's +# ControlPort, and is necessary for using TB with a system-installed Tor. # # Additionally, if using a system-installed Tor, the following about:config # options should be set (values in <> mean they are the value taken from your

1 0

[globe/master] Bump Globe version in package.json to 0.4.9.
by isis＠torproject.org 21 May '15

21 May '15

commit 01f90b176ac4541f0a27e12beb1af0ff49328143 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 10:35:14 2015 +0000 Bump Globe version in package.json to 0.4.9. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1a2482..29ef052 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "globe", - "version": "0.4.8", + "version": "0.4.9", "private": true, "scripts": { "start": "node app.js"

1 0

[globe/master] Merge branch 'trac-13084'
by isis＠torproject.org 21 May '15

21 May '15

commit 614c804ddd1188cba61cf9f957b702f0af829663 Merge: 3a92fba fef2cd4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 10:20:03 2015 +0000 Merge branch 'trac-13084' src/js/views/HistoryGraphView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0