November 2014 - tor-commits - lists.torproject.org

[orbot/master] Merge pull request #7 from SecUpwN/master
by n8fr8＠torproject.org 13 Nov '14

13 Nov '14

commit 3c4642cc823ac5ec30993ad2eb8af2a0efcfef39 Merge: 939df61 cdae262 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Sep 25 10:47:38 2014 -0400 Merge pull request #7 from SecUpwN/master Fixed annoying typo res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[webwml/master] update tor-doc-windows -- remove bunch of outdated stuff and increased the min bandwidth from 50 to 100KB
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit 7ea8c1221d1087c4bdefb3fcf2bc6f0821c584ce Author: Nima Fatemi <mrphs(a)riseup.net> Date: Tue Oct 28 02:29:18 2014 +0000 update tor-doc-windows -- remove bunch of outdated stuff and increased the min bandwidth from 50 to 100KB --- docs/en/tor-doc-windows.wml | 90 +++---------------------------------------- 1 file changed, 5 insertions(+), 85 deletions(-) diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml index de8f07d..c28f194 100644 --- a/docs/en/tor-doc-windows.wml +++ b/docs/en/tor-doc-windows.wml @@ -17,8 +17,8 @@ <br> <h2> - Note that these are advanced installation instructions for running Tor. If you want to use Tor just for anonymous web browsing, simply download the <a - href="<page projects/torbrowser>">Tor Browser Bundle</a> and you + If you want to use Tor just for anonymous web browsing, simply download <a + href="<page projects/torbrowser>">Tor Browser</a> and you are done. </h2> @@ -27,87 +27,7 @@ do), read the <a href="<page docs/tor-doc-relay>">Configuring a relay</a> guide.</b> </p> - - <p>Freedom House has produced a video on how to install Tor. You can - view it at <a href="https://media.torproject.org/video/2009-install-and-use-tor.ogv">How - to install Tor on Windows</a>. Know of a better video, or one - translated into your language? Let us know!</p> - - <div class="center"> - <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p> - </div> - - <hr> - <a id="installing"></a> - <h2><a class="anchor" href="#installing">Step One: Download and Install Tor</a></h2> - <br> - - <p> - The Vidalia Bundles for Windows contain <a href="<page - index>">Tor</a> and <a href="<page projects/vidalia>">Vidalia</a> - (a graphical user interface for Tor). - They come in different flavors, preconfigured for a convenient setup: The Relay bundle is set to forward traffic for other Tor users, the Bridge bundle turns your computer into a <a href="<page docs/bridges>">bridge</a>. Apart from that preconfiguration, all Vidalia bundles are the same and can easily be reconfigured. - </p> - - <p> - For anonymous web browsing, please use <a href="<page projects/torbrowser>">Tor Browser</a> and not one of the Vidalia bundles. If you want to use Tor as a client for other applications, download one of the Vidalia bundles and turn it into a client (Settings -> Sharing -> Run as a client only).</p> - - <img alt="tor installer splash page" src="$(IMGROOT)/screenshot-win32-installer-splash.png"> - - <p>If you have previously installed Tor and Vidalia you can deselect - whichever components you do not need to install in the dialog - shown below. - </p> - - <img alt="select components to install" src="$(IMGROOT)/screenshot-win32-installer-components.png"> - - <p>After you have completed the installer, the components - you selected will automatically be started for you. - </p> - - <hr> - <a id="using"></a> - <h2><a class="anchor" href="#using">Step Two: Configure your applications to use Tor</a></h2> - <br> - - <p> - If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc), - you can point your application at Tor (localhost - port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ - entry</a> for why this may be dangerous. - For applications with HTTP proxy support, but no support for Tor's SOCKS proxy, try <a href="http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/">polipo</a>. For applications that - support neither SOCKS nor HTTP, take a look at SocksCap or <a - href="http://www.freecap.ru/eng/">FreeCap</a>. (FreeCap is free - software; SocksCap is proprietary.)</p> - - <p>For information on how to Torify other applications, check out the - <a href="<wiki>doc/TorifyHOWTO">Torify - HOWTO</a>. - </p> - - <hr> - <a id="verify"></a> - <h2><a class="anchor" href="#verify">Step Three: Make sure it's working</a></h2> - <br> - - <p> - Check to see that Vidalia is running. Vidalia uses a small green onion - to indicate Tor is running or a dark onion with a red "X" when Tor is - not running. You can start or stop Tor by right-clicking - on Vidalia's icon in your system tray and selecting "Start" or "Stop" - from the menu as shown below: - </p> - - <img alt="Vidalia Tray Icon" src="$(IMGROOT)/screenshot-win32-vidalia.png"/> - - <p>If you have a personal firewall that limits your computer's ability - to connect to itself, be sure to allow connections from your local - applications to local port 9050. If your firewall blocks outgoing - connections, punch a hole so it can connect to at least TCP ports - 80 and 443, and then see <a href="<wikifaq>#FirewalledClient">this - FAQ entry</a>. - </p> - + <p>If it's still not working, look at <a href="<page docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p> @@ -120,12 +40,12 @@ <hr> <a id="server"></a> <a id="relay"></a> - <h2><a class="anchor" href="#relay">Step Four: Configure it as a relay</a></h2> + <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2> <br> <p>The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 50 kilobytes/s each way, please help out Tor by configuring your + at least 100 KiloBytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including rate limiting for bandwidth, exit policies so you can limit your exposure to abuse complaints, and support for dynamic

1 0

[webwml/master] Merge branch 'master' into staging
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit c4f7d23bd16e47db0c7b4fca7640556c6c50bb8d Merge: 7ea8c12 5f76c46 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 28 09:49:12 2014 +0100 Merge branch 'master' into staging en/index.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[webwml/master] Add some comments to include/blog-recent.wmi
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit bc93fae410a7c23b1803fde8eb99ed48c5630805 Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Oct 28 15:34:36 2014 +0100 Add some comments to include/blog-recent.wmi --- include/blog-recent.wmi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/blog-recent.wmi b/include/blog-recent.wmi index 25f6974..92bc046 100644 --- a/include/blog-recent.wmi +++ b/include/blog-recent.wmi @@ -1,2 +1,11 @@ <div class='blogRow blogRow1'> <br /><p class='blogDate' style=\"text-align:center;color:\#999;line-height:16px;\"><em>Recent posts are temporarily unavailable</em></p></div> +

1 0

[webwml/master] update .gitignore
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit bd4b46d86cf9f6ef8a0b5ccb1e8b04a0b17d88c0 Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Oct 28 15:31:04 2014 +0100 update .gitignore --- .gitignore | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4e539a7..1e06ffa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,17 +7,20 @@ about/contributors.html.en about/corepeople.html.en about/financials.html.en about/gsoc.html.en -about/overview.html.en -about/sponsors.html.en -about/torusers.html.en -about/translators.html.en -about/volunteers.html.en about/jobs-browserhacker.html.en +about/jobs-controller.html.en about/jobs-coredev.html.en +about/jobs-extdev.html.en +about/jobs-lead-automation.html.en about/jobs-pluggabletransport.html.en about/jobs-projectcoordinator.html.en about/jobs-translatorsupport.html.en about/jobs.html.en +about/overview.html.en +about/sponsors.html.en +about/torusers.html.en +about/translators.html.en +about/volunteers.html.en docs/N900.html.en docs/android.html.en docs/bridges.html.en @@ -33,6 +36,7 @@ docs/pluggable-transports.html.en docs/proxychain.html.en docs/rpms.html.en docs/running-a-mirror.html.en +docs/short-user-manual.html.en docs/signing-keys.html.en docs/tor-doc-osx.html.en docs/tor-doc-relay.html.en @@ -44,6 +48,8 @@ docs/tor-hidden-service.html.en docs/tor-manual-dev.html.en docs/tor-manual.html.en docs/tor-relay-debian.html.en +docs/torbutton/torbutton-faq.html.en +docs/torbutton/torbutton-options.html.en docs/trademark-faq.html.en docs/verifying-signatures.html.en donate/become-sponsor.html.en @@ -59,8 +65,8 @@ eff/tor-dmca-response.html.en eff/tor-legal-faq.html.en getinvolved/mirrors.html.en getinvolved/open-positions.html.en -getinvolved/research.html.en getinvolved/relays.html.en +getinvolved/research.html.en getinvolved/translation-overview.html.en getinvolved/translation.html.en getinvolved/tshirt.html.en @@ -89,4 +95,3 @@ projects/vidalia.html.en torbutton/index.html.en torbutton/torbutton-faq.html.en torbutton/torbutton-options.html.en -

1 0

[webwml/master] Merge branch 'master' into staging
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit 885532f16dbd7cc453ed629ea4e7dfa5ec4f3d9b Merge: bc93fae afe5813 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Oct 31 13:03:57 2014 +0100 Merge branch 'master' into staging Makefile | 2 +- include/mirrors-table.wmi | 272 +++++++----- include/tor-mirrors.csv | 142 +++--- include/versions.wmi | 2 +- projects/torbrowser/design/index.html.en | 701 +++++++++++++++++------------- 5 files changed, 650 insertions(+), 469 deletions(-)

1 0

[webwml/master] Merge branch 'master' into staging
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit 44d698fda36e28d74beea5fa6d1afb42a9904a79 Merge: 885532f 6b1c990 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Nov 3 00:53:55 2014 +0100 Merge branch 'master' into staging docs/en/verifying-signatures.wml | 2 +- include/versions.wmi | 10 +++--- projects/torbrowser/RecommendedTBBVersions | 6 +++- projects/torbrowser/design/index.html.en | 53 +++++++++++++++++++++------- 4 files changed, 52 insertions(+), 19 deletions(-)

1 0

[webwml/master] Merge branch 'master' into staging
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit f435fd933c476a572594b8cc800a199e2edefb70 Merge: 44d698f bb9b5da Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Nov 10 02:08:58 2014 +0100 Merge branch 'master' into staging include/links.wmi | 2 +- projects/torbrowser/design/index.html.en | 432 +++++++++++++++++------------- 2 files changed, 245 insertions(+), 189 deletions(-)

1 0

[webwml/master] Merge branch 'master' into staging
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit 393bc2fec7ecefa5e89c843a31308aecaa9ec00f Merge: f435fd9 08482db Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 11 05:02:58 2014 +0100 Merge branch 'master' into staging about/en/corepeople.wml | 4 ---- getinvolved/en/volunteer.wml | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-)

1 0

[webwml/master] Merge branch 'staging'
by sebastian＠torproject.org 13 Nov '14

13 Nov '14

commit 1e4e965c1012934f5da78f47077fcc17db83c661 Merge: 995f9e3 aa38962 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Nov 13 19:18:15 2014 +0100 Merge branch 'staging' Conflicts: projects/en/torbrowser.wml .gitignore | 19 +++++---- docs/en/tor-doc-relay.wml | 55 -------------------------- docs/en/tor-doc-windows.wml | 90 +++---------------------------------------- include/blog-recent.wmi | 9 +++++ include/head.wmi | 59 +++++++++++++++------------- projects/en/torbrowser.wml | 33 ++++++++-------- 6 files changed, 75 insertions(+), 190 deletions(-) diff --cc projects/en/torbrowser.wml index 1910761,ddd492b..9aef167 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@@ -508,9 -508,9 +508,10 @@@ </table> </div> </div> + --> </div> </div> - --> ++ <div id="macosx" class="anchor"></div> <div class="macosx box"> <div class="pjtitle"><h2>Mac OS X Instructions</h2></div>

1 0