- tor-commits - lists.torproject.org

r25379: {website} point people at the download pages for stable bundles, leave (website/trunk/projects/en)
by Andrew Lewman 09 Feb '12

09 Feb '12

Author: phobos Date: 2012-02-08 16:46:17 +0000 (Wed, 08 Feb 2012) New Revision: 25379 Modified: website/trunk/projects/en/vidalia.wml Log: point people at the download pages for stable bundles, leave the alpha bundles alone. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2012-02-08 08:38:43 UTC (rev 25378) +++ website/trunk/projects/en/vidalia.wml 2012-02-08 16:46:17 UTC (rev 25379) @@ -38,38 +38,19 @@ Tor client, bridge, or relay with a simple interface. Included in Vidalia is an extensive help system which helps you understand all of the options available to you. All of these features are translated - into a large number of languages. Vidalia does not work alone, it - requires Tor to be useful. (Tor is not included in the downloads on - this page.) + into a large number of languages. </p> <a id="Downloads"></a> <h3><a class="anchor" href="#Downloads">Downloads</a></h3> <p> - Most Windows and Mac OS X users should simply download Vidalia as part - of a <a href="<page download/download>">Tor software bundle</a>. If - you want to upgrade the Vidalia software included in a Tor bundle - you currently have installed, you can use one of the installer - packages below. + You should simply download Vidalia as part of a <a href="<page + download/download-easy>">Tor software bundle</a>. </p> - <h4>Stable Releases</h4> - <p> The most recent stable release is: <version-vidalia-stable></p> <ul> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>.exe">Windows Installer</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>.exe.asc">sig</a>) - </li> - <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X x86 Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) - </li> - <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-ppc.dmg">Mac OS X PPC Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-ppc.dmg.asc">sig</a>) - </li> - <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a> </li> <li> @@ -105,10 +86,11 @@ <a href="https://www.torproject.org/getinvolved/volunteer.html.en"> volunteer page</a> and see if there is something that interests you the most. - Vidalia's source code lives now in a Git repository under https://gitweb.torproject.org/vidalia. - The clone URL is git://git.torproject.org/vidalia. You should get to know how Vidalia - works internally in order to work with it. To do this you should know C++ - and Qt. + Vidalia's source code lives now in a <a + href="https://gitweb.torproject.org/vidalia">Git repository</a>. The + clone URL is git://git.torproject.org/vidalia. You should get to + know how Vidalia works internally in order to work with it. To do + this you should know C++ and Qt. </p> <a id="Support"></a> @@ -133,12 +115,12 @@ <p> Every project member inside Tor mostly uses IRC to communicate. Vidalia is - being developed currently by Matt Edman and Tomas Touceda. You can find - them in #vidalia channel at OFTC under the nicks edmanm and chiiph, - repectively. You should get in touch in order to see what's everyone working - on and to share what you've been working on or what you want to do. If you - intend to join the team, it's expected you stay around IRC, either in Vidalia's - channel, or #tor-dev. + being developed primarily by Tomas Touceda. You can find them in + #vidalia channel at OFTC under the nick chiiph, repectively. You + should get in touch in order to see what's everyone working on and + to share what you've been working on or what you want to do. If you + intend to join the team, it's expected you stay around IRC, either + in Vidalia's channel, or #tor-dev. </p> <p>

1 0

[tor/master] add a "docs" to the manual URI as listed in torrc.sample.in
by nickm＠torproject.org 08 Feb '12

08 Feb '12

commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 8 10:52:05 2012 -0500 add a "docs" to the manual URI as listed in torrc.sample.in --- changes/manual_uri_in_torrc | 3 +++ src/config/torrc.sample.in | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/manual_uri_in_torrc b/changes/manual_uri_in_torrc new file mode 100644 index 0000000..30b12ec --- /dev/null +++ b/changes/manual_uri_in_torrc @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Fix the URL for the online version of the manual that's listed in + torrc.sample. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f0c78ce..6455cbe 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -6,7 +6,7 @@ ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/tor-manual.html, +## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform:

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 08 Feb '12

08 Feb '12

commit ca431c54006341bf7097d2411b8742c4ab29e80d Merge: 332e96d 55e8cae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 8 10:52:34 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/manual_uri_in_torrc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] add a "docs" to the manual URI as listed in torrc.sample.in
by nickm＠torproject.org 08 Feb '12

08 Feb '12

commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 8 10:52:05 2012 -0500 add a "docs" to the manual URI as listed in torrc.sample.in --- changes/manual_uri_in_torrc | 3 +++ src/config/torrc.sample.in | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/manual_uri_in_torrc b/changes/manual_uri_in_torrc new file mode 100644 index 0000000..30b12ec --- /dev/null +++ b/changes/manual_uri_in_torrc @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Fix the URL for the online version of the manual that's listed in + torrc.sample. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f0c78ce..6455cbe 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -6,7 +6,7 @@ ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/tor-manual.html, +## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform:

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit 1fc5bc70e86fb7433c96d989e8f0b977323660b3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 15:15:20 2012 +0000 Update translations for vidalia_help --- ko/config.po | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ko/config.po b/ko/config.po index f23324e..4e8cc80 100644 --- a/ko/config.po +++ b/ko/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-02-08 14:43+0000\n" +"PO-Revision-Date: 2012-02-08 14:52+0000\n" "Last-Translator: Seongsu Yoon <sople1(a)snooey.net>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -66,6 +66,8 @@ msgid "" "automatically start Tor when Vidalia starts. You can also configure Vidalia " "to run when your system starts (<i>Windows only</i>)." msgstr "" +"<b>자동 실행 옵션</b>: Vidalia가 실행할 때 Tor도 같이 실행하도록 할 수 있습니다. 그리고 시스템을 시작할 때 " +"Vidalia도 같이 실행하도록 할 수 있습니다(<i>Windows 전용</i>)." #. type: Content of: <html><body> #: en/config.html:46 @@ -82,7 +84,7 @@ msgstr "네트워크 설정" msgid "" "The <i>Network</i> settings page lets you change how Tor connects to the Tor" " network." -msgstr "" +msgstr "<i>네트워크</i> 설정 페이지는 Tor 네트워크에 어떻게 접속할 지 설정할 수 있습니다." #. type: Content of: <html><body><ul><li> #: en/config.html:53

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit a03f8de153a547e2acf733d730d5777b79ed7646 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 14:45:31 2012 +0000 Update translations for vidalia_help --- ko/config.po | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ko/config.po b/ko/config.po index c4437e2..f23324e 100644 --- a/ko/config.po +++ b/ko/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-02-08 14:11+0000\n" +"PO-Revision-Date: 2012-02-08 14:43+0000\n" "Last-Translator: Seongsu Yoon <sople1(a)snooey.net>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -27,22 +27,24 @@ msgid "" "of Vidalia and Tor. It also lets you set up and manage a <a " "href=\"server.html\">Tor relay</a> so you can help the Tor network grow." msgstr "" +"Vidalia와 Tor는 설정 창에서 흔히 바꾸는 일부 값이나 항목을 바꿀 수 있습니다. 그리고 Tor 네트워크의 성장에 기쓰이는여할 수" +" 있는 <a href=\"server.html\">Tor 릴레이</a>를 설치하거나 관리할 수 있습니다." #. type: Content of: <html><body> #: en/config.html:26 msgid "<a name=\"general\"/>" -msgstr "" +msgstr "<a name=\"general\"/>" #. type: Content of: <html><body><h3> #: en/config.html:27 msgid "General Settings" -msgstr "" +msgstr "일반 설정" #. type: Content of: <html><body><p> #: en/config.html:29 msgid "" "Settings on the <i>General</i> page are the most commonly modified settings." -msgstr "" +msgstr "<i>일반</i> 페이지는 흔히 바꾸는 항목을 설정할 수 있습니다." #. type: Content of: <html><body><ul><li> #: en/config.html:32 @@ -53,6 +55,9 @@ msgid "" "by clicking the <i>Browse</i> button and navigating to the particular Tor " "installation you want." msgstr "" +"<b>Tor 실행 파일</b>: 작업 표시줄에서 <i>시작</i> 을 눌러 Vidalia을 구동할 수 있는 Tor 실행 파일입니다. 여러" +" 버전의 Tor 를 설치하였다면, <i>찾기</i> 버튼을 눌러 사용하려는 Tor 가 설치된 폴더를 지정하여 Vidalia를 구동할 수" +" 있습니다." #. type: Content of: <html><body><ul><li> #: en/config.html:39 @@ -65,12 +70,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:46 msgid "<a name=\"network\"/>" -msgstr "" +msgstr "<a name=\"network\"/>" #. type: Content of: <html><body><h3> #: en/config.html:47 msgid "Network Settings" -msgstr "" +msgstr "네트워크 설정" #. type: Content of: <html><body><p> #: en/config.html:49 @@ -121,17 +126,17 @@ msgstr "" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:80 msgid "128.213.48.13:8080" -msgstr "" +msgstr "128.213.48.13:8080" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:83 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" -msgstr "" +msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:86 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" -msgstr "" +msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 @@ -145,12 +150,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:100 msgid "<a name=\"relay\"/>" -msgstr "" +msgstr "<a name=\"relay\"/>" #. type: Content of: <html><body><h3> #: en/config.html:101 msgid "Relay Settings" -msgstr "" +msgstr "릴레이 설정" #. type: Content of: <html><body><p> #: en/config.html:103 @@ -162,12 +167,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:109 msgid "<a name=\"appearance\"/>" -msgstr "" +msgstr "<a name=\"appearance\"/>" #. type: Content of: <html><body><h3> #: en/config.html:110 msgid "Appearance Settings" -msgstr "" +msgstr "모양 설정" #. type: Content of: <html><body><p> #: en/config.html:112 @@ -198,12 +203,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:131 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/config.html:132 msgid "Advanced Settings" -msgstr "" +msgstr "고급 설정" #. type: Content of: <html><body><p> #: en/config.html:134 @@ -286,12 +291,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:189 msgid "<a name=\"services\"/>" -msgstr "" +msgstr "<a name=\"services\"/>" #. type: Content of: <html><body><h3> #: en/config.html:190 msgid "Hidden Service Settings" -msgstr "" +msgstr "숨은 서비스 설정" #. type: Content of: <html><body><p> #: en/config.html:192

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit 6f702e65423868b78b60f8b550934929e7049518 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 14:15:19 2012 +0000 Update translations for vidalia_help --- ko/config.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/config.po b/ko/config.po index 18d138c..c4437e2 100644 --- a/ko/config.po +++ b/ko/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-02-08 13:41+0000\n" +"PO-Revision-Date: 2012-02-08 14:11+0000\n" "Last-Translator: Seongsu Yoon <sople1(a)snooey.net>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/config.html:16 msgid "Configuring Vidalia and Tor" -msgstr "Vidalia 및 Tor 설정" +msgstr "Vidalia 및 Tor 설정하기" #. type: Content of: <html><body><p> #: en/config.html:20

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit b407139b9d29c71db8732d4cb1aef10ac49da90e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 13:45:19 2012 +0000 Update translations for vidalia_help --- ko/config.po | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ko/config.po b/ko/config.po index a36a3e6..18d138c 100644 --- a/ko/config.po +++ b/ko/config.po @@ -1,12 +1,13 @@ # # Translators: +# Seongsu Yoon <sople1(a)snooey.net>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2010-12-21 22:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-02-08 13:41+0000\n" +"Last-Translator: Seongsu Yoon <sople1(a)snooey.net>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/config.html:16 msgid "Configuring Vidalia and Tor" -msgstr "" +msgstr "Vidalia 및 Tor 설정" #. type: Content of: <html><body><p> #: en/config.html:20 @@ -135,14 +136,10 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body>

1 0

[tor/master] Fix fencepost error with HearbeatPeriod option
by arma＠torproject.org 08 Feb '12

08 Feb '12

commit 332e96d1098b00ab21e635a19e9b427d3c735e33 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jan 22 13:39:56 2012 +0100 Fix fencepost error with HearbeatPeriod option We'd only log every HeartbeatPeriod + 1 seconds. Discovered by Scott Bennett, reported as bug 4942. --- changes/bug4942 | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4942 b/changes/bug4942 new file mode 100644 index 0000000..012d105 --- /dev/null +++ b/changes/bug4942 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Actually log the heartbeat message every HeartbeatPeriod seconds, not + every HeartbeatPeriod + 1 seconds. Fixes bug 4942; bugfix on + 0.2.3.1-alpha.. Bug reported by Scott Bennett. + diff --git a/src/or/main.c b/src/or/main.c index 7ef14aa..9022f2e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1533,7 +1533,7 @@ run_scheduled_events(time_t now) /** 12. write the heartbeat message */ if (options->HeartbeatPeriod && - time_to_next_heartbeat < now) { + time_to_next_heartbeat <= now) { log_heartbeat(now); time_to_next_heartbeat = now+options->HeartbeatPeriod; }

1 0

[tor/master] Update sample torrc file for 0.2.3.x
by arma＠torproject.org 08 Feb '12

08 Feb '12

commit 9bcf315e9bdb063a09cdb824803dac1bd607a217 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 8 04:40:26 2012 -0500 Update sample torrc file for 0.2.3.x Fix broken URLs. Tell readers about the OutboundBindAddress, ExitPolicyRejectPrivate, and PublishServerDescriptor options. --- changes/bug4652 | 5 ++++ src/config/torrc.sample.in | 50 ++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/changes/bug4652 b/changes/bug4652 new file mode 100644 index 0000000..3df9f66 --- /dev/null +++ b/changes/bug4652 @@ -0,0 +1,5 @@ + o Minor features: + - Fix broken URLs in the sample torrc file, and tell readers about + the OutboundBindAddress, ExitPolicyRejectPrivate, and + PublishServerDescriptor options. Addresses bug 4652. + diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f0c78ce..1ea5d9f 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,16 +1,16 @@ ## Configuration file for a typical Tor user -## Last updated 16 July 2009 for Tor 0.2.2.1-alpha. -## (May or may not work for much older or much newer versions of Tor.) +## Last updated 8 February 2012 for Tor 0.2.3.12-alpha. +## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/tor-manual.html, +## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform: -## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc +## https://www.torproject.org/docs/faq#torrc ## Replace this with "SocksPort 0" if you plan to run Tor only as a @@ -21,7 +21,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## Entry policies to allow/deny SOCKS requests based on IP address. ## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests from SocksListenAddress. +## all (and only) requests from SocksListenAddress. Untrusted users who +## can access your SocksPort may be able to learn about the connections +## you make. #SocksPolicy accept 192.168.0.0/16 #SocksPolicy reject * @@ -86,13 +88,17 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## yourself to make this work. #ORListenAddress 0.0.0.0:9090 +## The IP address or full DNS name for incoming connections to your +## relay. Leave commented out and Tor will guess. +#Address noname.example.com + +## If you have multiple network interfaces, you can specify one for +## outgoing traffic to use. +# OutboundBindAddress 10.0.0.5 + ## A handle for your relay, so people don't have to refer to it by key. #Nickname ididnteditheconfig -## The IP address or full DNS name for your relay. Leave commented out -## and Tor will guess. -#Address noname.example.com - ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must ## be at least 20 KB. @@ -100,9 +106,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost #RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps) ## Use these to restrict the maximum traffic per day, week, or month. -## Note that this threshold applies to sent _and_ to received bytes, -## not to their sum: Setting "4 GB" may allow up to 8 GB -## total before hibernating. +## Note that this threshold applies separately to sent and received bytes, +## not to their sum: setting "4 GB" may allow up to 8 GB total before +## hibernating. ## ## Set a maximum of 4 gigabytes each way per period. #AccountingMax 4 GB @@ -117,7 +123,7 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## indexes this, so spammers might also collect it. #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: -#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com> +#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> ## Uncomment this to mirror directory information for others. Please do ## if you have enough bandwidth. @@ -137,7 +143,7 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## key fingerprint of each Tor relay you control, even if they're on ## different networks. You declare it here so Tor clients can avoid ## using more than one of your relays in a single circuit. See -## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers +## https://www.torproject.org/docs/faq#MultipleRelays #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first @@ -155,16 +161,24 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost ## you should update your exit policy to reflect this -- otherwise Tor ## users will be told that those destinations are down. ## +## For security, by default Tor rejects connections to private (local) +## networks, including to your public IP address. See the man page entry +## for ExitPolicyRejectPrivate if you want to allow "exit enclaving". +## #ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more #ExitPolicy accept *:119 # accept nntp as well as default exit policy #ExitPolicy reject *:* # no exits allowed -# + ## Bridge relays (or "bridges") are Tor relays that aren't listed in the -## main directory. Since there is no complete public list of them, even if an -## ISP is filtering connections to all the known Tor relays, they probably +## main directory. Since there is no complete public list of them, even an +## ISP that filters connections to all the known Tor relays probably ## won't be able to block all the bridges. Also, websites won't treat you ## differently because they won't know you're running Tor. If you can ## be a real relay, please do; but if not, be a bridge! #BridgeRelay 1 -#ExitPolicy reject *:* +## By default, Tor will advertise your bridge to users through various +## mechanisms like https://bridges.torproject.org/. If you want to run +## a private bridge, for example because you'll give out your bridge +## address manually to your friends, uncomment this line: +#PublishServerDescriptor 0

1 0