June 2012 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 24 Jun '12

24 Jun '12

commit 7105ace63d1c2b52df1edc824158644de7059fe7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 10:45:17 2012 +0000 Update translations for vidalia_help --- zh_CN/server.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zh_CN/server.po b/zh_CN/server.po index 886d7e8..a4feed7 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -1,14 +1,15 @@ # # Translators: # chen zhang <magnyfx(a)hotmail.com>, 2011. +# Curtis Stone <cstone(a)fastmail.cn>, 2012. # <hua5679(a)gmail.com>, 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 17:00+0200\n" -"PO-Revision-Date: 2012-02-14 10:03+0000\n" -"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" +"PO-Revision-Date: 2012-06-24 10:33+0000\n" +"Last-Translator: Curtis Stone <cstone(a)fastmail.cn>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,7 +113,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/server.html:72 msgid "Bandwidth Limits" -msgstr "" +msgstr "带宽限制" #. type: Content of: <html><body><p> #: en/server.html:74 @@ -253,7 +254,7 @@ msgstr "443" #. type: Content of: <html><body><table><tr><td> #: en/server.html:150 msgid "Encrypted Web browsing" -msgstr "" +msgstr "加密网页浏览" #. type: Content of: <html><body><table><tr><td> #: en/server.html:153 @@ -273,7 +274,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:158 msgid "Instant Messaging (IM)" -msgstr "" +msgstr "即时消息（IM）" #. type: Content of: <html><body><table><tr><td> #: en/server.html:159 @@ -289,7 +290,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:163 msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "互联网中继聊天（IRC）" #. type: Content of: <html><body><table><tr><td> #: en/server.html:164 @@ -342,7 +343,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/server.html:189 msgid "Port Forwarding" -msgstr "" +msgstr "端口转发" #. type: Content of: <html><body><p> #: en/server.html:191

1 0

r25695: {website} faq: is there a tor forum? (website/trunk/docs/en)
by Roger Dingledine 24 Jun '12

24 Jun '12

Author: arma Date: 2012-06-24 06:51:59 +0000 (Sun, 24 Jun 2012) New Revision: 25695 Modified: website/trunk/docs/en/faq.wml Log: faq: is there a tor forum? Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2012-06-22 19:34:54 UTC (rev 25694) +++ website/trunk/docs/en/faq.wml 2012-06-24 06:51:59 UTC (rev 25695) @@ -25,6 +25,7 @@ <li><a href="#DistributingTor">Can I distribute Tor on my magazine's CD?</a></li> <li><a href="#SupportMail">How can I get support?</a></li> + <li><a href="#Forum">Is there a Tor forum?</a></li> <li><a href="#WhySlow">Why is Tor so slow?</a></li> <li><a href="#Funding">What would The Tor Project do with more funding?</a></li> @@ -397,6 +398,22 @@ <hr> + <a id="Forum"></a> + <h3><a class="anchor" href="#Forum">Is there a Tor forum?</a></h3> + + <p>Not yet, but we're working on it. Most forum software is + a disaster to maintain and keep secure, and at the same time + too many of the Tor developers are spread too thin to be able + to contribute enough to a forum. As of June 2012, we have a + funder who wants to help us do it right. Stay tuned! (Tickets <a + href="https://trac.torproject.org/projects/tor/ticket/3592">3592</a> + and <a + href="https://trac.torproject.org/projects/tor/ticket/5995">5995</a> + relate to forums too.) + </p> + + <hr> + <a id="WhySlow"></a> <h3><a class="anchor" href="#WhySlow">Why is Tor so slow?</a></h3>

1 0

[torspec/master] Add glossary.txt - define terms we use everywhere in one place for clarity
by ioerror＠torproject.org 24 Jun '12

24 Jun '12

commit b4195a51a98f0c54efbbf9a9e5241cd4ce6f57a4 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jun 23 20:19:57 2012 -0700 Add glossary.txt - define terms we use everywhere in one place for clarity --- glossary.txt | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/glossary.txt b/glossary.txt new file mode 100644 index 0000000..c3fbf74 --- /dev/null +++ b/glossary.txt @@ -0,0 +1,22 @@ + + Glossary + + The Tor Project + +Note: This document aims to specify terms, notations or phrases related to Tor and The +Tor Project. + +This glossary is not a design document; it is only a reference. + +0. Preliminaries + + The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL + NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and + "OPTIONAL" in this document are to be interpreted as described in + RFC 2119. + +0.1 Commonly used Tor configuration terms + + ORPort - Onion Router Port + DirPort - Directory Port +

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 24 Jun '12

24 Jun '12

commit 5869577f6ad685b8147e5305a9d51232f204ad88 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 24 00:45:07 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index 0d9e738..072b32a 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-06-23 21:59+0000\n" +"PO-Revision-Date: 2012-06-24 00:30+0000\n" "Last-Translator: Knut Ole <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -40,12 +40,12 @@ msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "'%1' er ikke en gyldig IP adresse." +msgstr "\"%1\" er ikke en gyldig IP-adresse." msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." -msgstr "Du valgte 'Passord' autentisering, men du spesifiserte ikke ett passord." +msgstr "Du valgte Passord-autentisering, men du skrev ikke inn et passord." msgctxt "AdvancedPage" msgid "Select Tor Configuration File" @@ -69,7 +69,7 @@ msgstr "Kunne ikke opprette %1 [%2]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "Velg en mappe for lagring av Tors data" +msgstr "Velg en mappe for lagring av Tor-data" msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" @@ -219,7 +219,7 @@ msgstr "Språk" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "Velg språket du vil Vidalia skal bruke" +msgstr "Velg språk for Vidalia" msgctxt "AppearancePage" msgid "Style" @@ -227,7 +227,7 @@ msgstr "Stil" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "Velg stil for Vidalia's grensesnitt" +msgstr "Velg stil for Vidalias grensesnitt" msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." @@ -316,11 +316,11 @@ msgstr "Kobler til %1:%2..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Sender en HTTP-forespørsel for broer..." +msgstr "Sender en HTTPS-forespørsel for broer..." msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "Laster ned liste av broer..." +msgstr "Laster ned en liste over broer..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Jun '12

23 Jun '12

commit eae72d2563f9673d4711c9fb3861c71f7b3ed9fb Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 22:15:09 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index 68f0ec4..0d9e738 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-06-23 21:44+0000\n" +"PO-Revision-Date: 2012-06-23 21:59+0000\n" "Last-Translator: Knut Ole <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -204,7 +204,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "Du har valgt automatiske innstillinger for KontrollPorten, men ikke oppgitt en data-mappe. Vennligst oppgi en data-mappe, eller ikke velg \"Automatisk KontrollPort Innstillinger.\"" msgctxt "AdvancedPage" msgid "" @@ -236,7 +236,7 @@ msgstr "Vidalia kunne ikke laste inn den valgte språkoversettelsen" msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "Innstillinger for system-ikoner (forandringer oppdateres når Vidalia starter neste gang)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" @@ -1331,7 +1331,7 @@ msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" -msgstr "" +msgstr "med en beskrivelse av hva du gjorde før programmet krasjet, med de følgende filene beskrevet i krasj-rapporten:" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2087,21 +2087,21 @@ msgstr "Alt som sendes over denne tilkoblingen kan risikere å bli overvåket. msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "Klargjør torrc fra %1 til %2" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(sannsynligvis Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(sannsynligvis et email-program)" msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "Et program %1 forsøker å gjøre mulige ukrypterte og risikable tilkoblinger til port %2." msgctxt "MainWindow" msgid "failed (%1)" @@ -2119,14 +2119,14 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia klarer ikke å kommunisere med Tor for den ikke kan finne denne filen: %1\n\nDette er den siste feilmeldingen:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Det ser ut til at Tor har stoppet siden Vidalia startet det. \n\nSe i den Avanserte Meldingsloggen for mer informasjon." msgctxt "MainWindow" msgid "" @@ -2691,7 +2691,7 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Du må velge én eller flere broer." msgctxt "Policy" msgid "accept" @@ -3115,11 +3115,11 @@ msgstr "Distribuér min bro-adresse automatisk." msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Videresend trafikk for Tor-nettverket (exit relay)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Videresend trafikk for Tor-nettverket (kun internt i nettverket)" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3794,7 +3794,7 @@ msgstr "Kunne ikke åpne loggfil '%1': %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "Påkrevd verdi for parameter:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Jun '12

23 Jun '12

commit fb823211d9eec98883b3e81946d6ab3cf285a81f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 21:45:10 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index bea72fe..68f0ec4 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-06-23 16:49+0000\n" +"PO-Revision-Date: 2012-06-23 21:44+0000\n" "Last-Translator: Knut Ole <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -197,7 +197,7 @@ msgstr "Velg en fil for Tors kontaktplugg (socket)" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Konfigurér KontrollPorten automatisk" msgctxt "AdvancedPage" msgid "" @@ -1312,20 +1312,20 @@ msgstr "Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia man msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "Vennligst fyll inn en melding på:" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" "A crash report has been created that you can send to the Vidalia developers " "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." -msgstr "" +msgstr "Det er opprettet en krasj-rapport som du kan sende til Vidalia-utviklerene for å hjelpe dem med å identifisere og rette problemet. Rapporten inneholder ingen informasjon som kan identifisere deg overhodet." msgctxt "CrashReportDialog" msgid "" @@ -3456,7 +3456,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "" +msgstr "Ditt relay er nå koblet til nettet og klart til bruk for andre i Tor-nettverket. Du burde se en økning i internett-trafikk i trafikk-grafen i løpet av noen timer, etter som flere og flere brukere får vite om ditt relay. Takk for at du bidrar til Tor-nettverket!" msgctxt "Stream" msgid "New" @@ -3512,37 +3512,37 @@ msgstr "Feil ved kryptering av kontrollpassord." msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "Redigér torrc" msgctxt "TorrcDialog" msgid "" "Save settings. If unchecked it will only apply settings to the current Tor " "instance." -msgstr "" +msgstr "Lagre innstillinger. Hvis ikke valgt, vil endringene kun gjelde nå og ikke for fremtidig bruk av Tor." msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "Klipp ut" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "Kopier" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "Lim inn" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "Angre" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "Gjør om" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "Velg alt" msgctxt "TorrcDialog" msgid "Apply all" @@ -3554,7 +3554,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "Feil ved tilkobling til Tor" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" @@ -3562,15 +3562,15 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "Feil i linje %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "Feil" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "En feil oppstod under åpning av torrc filen" msgctxt "UPNPControl" msgid "Success"

1 0

[tor/master] Catch a few more K&R violations with make check-spaces
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit a6688c574e569a2a018038414198ab440344ba95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:51:48 2012 -0400 Catch a few more K&R violations with make check-spaces We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful. --- contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index a18df99..682dbce 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -32,10 +32,18 @@ for $fn (@ARGV) { if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } - ## Warn about #else #if instead of #elif. + ## Warn about #else #if instead of #elif. if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { print " #else#if:$fn:$.\n"; } + ## Warn about some K&R violations + if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and + $lastline !~ /\{$/) { + print "non-K&R {:$fn:$.\n"; + } + if (/^\s*else/ and $lastline =~ /\}$/) { + print " }\\nelse:$fn:$.\n"; + } $lastline = $_; ## Warn about unnecessary empty lines. if ($lastnil && /^\s*}\n/) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfd1956..074b78d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */ - if (!tor_addr_is_null(&ri->ipv6_addr)) - { + if (!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_port_t ap; router_get_pref_orport(ri, &ap); log_notice(LD_CONFIG, diff --git a/src/or/main.c b/src/or/main.c index 1f3117b..95ac8d6 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[]) // a file on a folder shared by the wm emulator. // if no flashcard (real or emulated) is present, // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) - { + if (find_flashcard_path(path,MAX_PATH) == -1) { redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); } else { diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f7f3024..d178508 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_prim_orport(node->ri, ap_out); - } - else if (node->rs) { + } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); ap_out->port = node->rs->or_port; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 8e5d3cab2636aa7a41fd14a09e027cee9fe42df2 Merge: 95ad59f a6688c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:54:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.3] Catch a few more K&R violations with make check-spaces
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit a6688c574e569a2a018038414198ab440344ba95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:51:48 2012 -0400 Catch a few more K&R violations with make check-spaces We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful. --- contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index a18df99..682dbce 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -32,10 +32,18 @@ for $fn (@ARGV) { if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } - ## Warn about #else #if instead of #elif. + ## Warn about #else #if instead of #elif. if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { print " #else#if:$fn:$.\n"; } + ## Warn about some K&R violations + if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and + $lastline !~ /\{$/) { + print "non-K&R {:$fn:$.\n"; + } + if (/^\s*else/ and $lastline =~ /\}$/) { + print " }\\nelse:$fn:$.\n"; + } $lastline = $_; ## Warn about unnecessary empty lines. if ($lastnil && /^\s*}\n/) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfd1956..074b78d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */ - if (!tor_addr_is_null(&ri->ipv6_addr)) - { + if (!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_port_t ap; router_get_pref_orport(ri, &ap); log_notice(LD_CONFIG, diff --git a/src/or/main.c b/src/or/main.c index 1f3117b..95ac8d6 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[]) // a file on a folder shared by the wm emulator. // if no flashcard (real or emulated) is present, // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) - { + if (find_flashcard_path(path,MAX_PATH) == -1) { redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); } else { diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f7f3024..d178508 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_prim_orport(node->ri, ap_out); - } - else if (node->rs) { + } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); ap_out->port = node->rs->or_port; }

1 0

[tor/master] fix broken utf8-ism
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit ce44346aa5b4dddf37aff992755ef472d0d1f5a2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:42:18 2012 -0400 fix broken utf8-ism --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90d6084..e2e9f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -287,7 +287,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 0.2.2.11-alpha. - Correctly handle checking the permissions on the parent directory of a control socket in the root directory. Bug found - by Esteban Manchado VelÃ¡zquez. Fixes bug 5089; bugfix on Tor + by Esteban Manchado Velázquez. Fixes bug 5089; bugfix on Tor 0.2.2.26-beta. - When told to add a bridge with the same digest as a preexisting bridge but a different addr:port, change the addr:port as

1 0