December 2011 - tor-commits - lists.torproject.org

[vidalia/alpha] Fix #4290.
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit fe2070791056354f17296f48bc109f4e715d6b81 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Oct 30 13:56:15 2011 +0500 Fix #4290. Give an error if bridges option is checked and none are specified. --- src/vidalia/config/NetworkPage.cpp | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index 0fa33ca..e67686c 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -317,6 +317,13 @@ NetworkPage::save(QString &errmsg) } settings.setReachablePorts(reachablePorts); + if (ui.chkUseBridges->isChecked()) { + if (ui.listBridges->count() < 1) { + errmsg = tr("You must specify one or more briges."); + return false; + } + } + /* Save the bridge settings */ settings.setUseBridges(ui.chkUseBridges->isChecked()); for (int i = 0; i < ui.listBridges->count(); i++)

1 0

[vidalia/alpha] Updated help docs for #4290.
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 65c629223b9edf4e19b557807857bec9a409985b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Oct 30 14:30:12 2011 +0500 Updated help docs for #4290. --- src/vidalia/help/content/en/config.html | 12 ++++-------- src/vidalia/help/content/po/en/config.po | 14 ++++++-------- src/vidalia/help/content/po/templates/config.pot | 12 ++++-------- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/vidalia/help/content/en/config.html b/src/vidalia/help/content/en/config.html index b1c25c0..c9dc681 100644 --- a/src/vidalia/help/content/en/config.html +++ b/src/vidalia/help/content/en/config.html @@ -86,14 +86,10 @@ network. 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73 </li> </ul> - 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. </li> </ul> diff --git a/src/vidalia/help/content/po/en/config.po b/src/vidalia/help/content/po/en/config.po index 38567ae..ff4d8e6 100644 --- a/src/vidalia/help/content/po/en/config.po +++ b/src/vidalia/help/content/po/en/config.po @@ -142,14 +142,12 @@ 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." +"My ISP blocks connections to the Tor network: If your ISP (Internet " +"Service Provider) blocks connections to the Tor network, Tor can attempt to " +"avoid being filtered by encrypting its directory connections and connecting " +"to the Tor network through relays called bridges (Tor 0.2.0.3-alpha " +"or newer only). You can add bridge relays by specifying either their address " +"and port number, or their address, port number, and fingerprint." msgstr "" #. type: Content of: <html><body> diff --git a/src/vidalia/help/content/po/templates/config.pot b/src/vidalia/help/content/po/templates/config.pot index d40ebf7..0447e27 100644 --- a/src/vidalia/help/content/po/templates/config.pot +++ b/src/vidalia/help/content/po/templates/config.pot @@ -142,14 +142,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

[vidalia/alpha] Add the missing plist file
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 27e5dc28cccf4e0e012042ec1241955d7d6f6280 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Oct 6 21:39:22 2011 -0300 Add the missing plist file --- src/vidalia/MacOSXBundleInfo.plist.in | 38 +++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MacOSXBundleInfo.plist.in b/src/vidalia/MacOSXBundleInfo.plist.in new file mode 100644 index 0000000..3b5bfe0 --- /dev/null +++ b/src/vidalia/MacOSXBundleInfo.plist.in @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> + <key>CFBundleGetInfoString</key> + <string>${MACOSX_BUNDLE_INFO_STRING}</string> + <key>CFBundleIconFile</key> + <string>${MACOSX_BUNDLE_ICON_FILE}</string> + <key>CFBundleIdentifier</key> + <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleLongVersionString</key> + <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> + <key>CFBundleName</key> + <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> + <key>CSResourcesFileMapped</key> + <true/> + <key>LSRequiresCarbon</key> + <true/> + <key>NSHumanReadableCopyright</key> + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> + <key>LSUIElement</key> + <string>1</string> +</dict> +</plist>

1 0

[vidalia/alpha] Add changes file for bug 4290
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit d5551eb01c1a285a08e46bebbc0ea79d346c7eb0 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 17:15:40 2011 -0300 Add changes file for bug 4290 --- changes/bug4290 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4290 b/changes/bug4290 new file mode 100644 index 0000000..552cf0d --- /dev/null +++ b/changes/bug4290 @@ -0,0 +1,3 @@ + o Do not allow users to check the "My ISP blocks..." checkbox + without entering any bridges. Also updates the + documentation. Fixes bug 4290. \ No newline at end of file

1 0

[vidalia/alpha] Add more checks to the plugin engine
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit bab083b3e21b5c1dfebbb3de478568d11ba4947f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Oct 7 02:19:11 2011 -0300 Add more checks to the plugin engine To better debug problems, add one more check for exceptions and added the actual error message from the exception. --- src/vidalia/plugin/PluginWrapper.cpp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vidalia/plugin/PluginWrapper.cpp b/src/vidalia/plugin/PluginWrapper.cpp index c74ef7b..476b1db 100644 --- a/src/vidalia/plugin/PluginWrapper.cpp +++ b/src/vidalia/plugin/PluginWrapper.cpp @@ -38,6 +38,7 @@ PluginWrapper::PluginWrapper(const QString &info_path, PluginEngine *engine, QOb if(res.state() == QScriptSyntaxCheckResult::Valid) { DebugDialog::outputDebug("Everything's ok, evaluating..."); _engine->evaluate(contents); + checkExceptions(); } else { DebugDialog::syntaxDebug(tr("%4: ERROR: Line: %1 - Column: %2\n%3") .arg(res.errorLineNumber()) @@ -154,8 +155,8 @@ PluginWrapper::checkExceptions() { if(_engine->hasUncaughtException()) { DebugDialog::exceptDebug(tr("%2:\n*** Exception in line %1") - .arg(_engine->uncaughtExceptionLineNumber()) - .arg(name())); + .arg(_engine->uncaughtExceptionLineNumber()) + .arg(_engine->uncaughtException().toString())); DebugDialog::exceptDebug(tr("*** Backtrace:")); foreach(QString line, _engine->uncaughtExceptionBacktrace()) { vInfo(line);

1 0

r25268: {website} Try to trim and simplify the download warning text. (website/trunk/download/en)
by Mike Perry 24 Dec '11

24 Dec '11

Author: mikeperry Date: 2011-12-24 20:39:54 +0000 (Sat, 24 Dec 2011) New Revision: 25268 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: Try to trim and simplify the download warning text. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-12-24 02:38:37 UTC (rev 25267) +++ website/trunk/download/en/download-easy.wml 2011-12-24 20:39:54 UTC (rev 25268) @@ -148,59 +148,65 @@ <ol> <li> -Tor only protects Internet applications that are configured to send -their traffic through Tor — it doesn't magically anonymize all -your traffic just because you install it. We recommend you use the -<a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It is -pre-configured to protect your privacy and anonymity on the web as long -as you are browsing with Tor Browser. + +Tor only protects Internet applications that are configured to send their +traffic through Tor — it doesn't magically anonymize all of your traffic +just because you install it. We strongly recommend you use the <a href="<page +projects/torbrowser>">Tor Browser Bundle</a>. It is pre-configured to protect +your privacy and anonymity on the web as long as you're browsing with Tor +Browser itself. Almost any other web browser configuration is likely to be +unsafe. Similarly, we do not recommend installing additional addons into the +Tor Browser, as these may bypass Tor or otherwise impede your anonymity. + </li> <li> -Tor Browser and Torbutton block browser plugins such as Java, Flash, + +The Tor Browser will block browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's PDF plugin, and others: they can be manipulated into revealing your IP address. For example, that -means Youtube is disabled. If you really need your Youtube, you can <a -href="<page torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> +means Youtube is disabled. If you really need your Youtube, you can +<a href="<page torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> to allow it; but be aware that you're opening yourself up to potential -attack. Also, extensions like Google toolbar look up more information -about the websites you type in: they may bypass Tor and/or broadcast -sensitive information. Some people prefer using two browsers (one for Tor, -one for non-Tor browsing). +attack. + </li> <li> -Beware of cookies: if you ever browse without Tor and a site gives -you a cookie, that cookie could identify you even when you start -using Tor again. Torbutton tries to handle your cookies safely. <a -href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help -protect any cookies you do not want to lose. + +Similarly, the Tor Browser Bundle will warn you before automatically opening +documents that are handled by external applications. DO NOT IGNORE THIS +WARNING. You should be very careful when downloading documents via Tor +(especially DOC and PDF files) as these documents can contain Internet +resources that will be downloaded outside of Tor by the application that +opens them. These documents can be modified by malicious exit nodes, or by +someone who is trying to trick you into revealing your non-Tor IP address. If +you must work with DOC and/or PDF files, we strongly recommend using a +disconnected computer, a <a href="https://www.virtualbox.org/">VirtualBox</a> +free <a href="http://virtualboxes.org/">image</a> with networking disabled, or +<a href="http://tails.boum.org/">Tails</a>. + </li> <li> -Tor anonymizes the origin of your traffic, and it encrypts everything -between you and the Tor network and everything inside the Tor network, -but <a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it -can't encrypt your traffic between the Tor network and its final -destination.</a> If you are communicating sensitive information, you -should use as much care as you would on the normal scary Internet — -use HTTPS or other end-to-end encryption and authentication. <a -href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> is a -Firefox extension produced as a collaboration between The Tor Project -and the Electronic Frontier Foundation. It encrypts your communications -with a number of major websites. + +Tor anonymizes the origin of your traffic, and it encrypts everything between +you and the Tor network and everything inside the Tor network, but +<a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it can't encrypt your traffic +between the Tor network and its final destination.</a> To help ensure +privacy for this last leg, the Tor Browser Bundle includes +<a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to encrypt +your communications with a number of major websites, but you should still +watch the browser URL bar to ensure that websites you provide sensitive information +to display a +<a href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue or +green validation</a>, include https:// in the URL bar, +and display the proper name for the current website. + </li> <li> -While Tor blocks attackers on your local network from discovering -or influencing your destination, it opens new risks: malicious or -misconfigured Tor exit nodes can send you the wrong page, or even send -you embedded Java applets disguised as domains you trust. Be careful -opening documents or applications you download through Tor, unless you've -verified their integrity. -</li> -<li> Tor tries to prevent attackers from learning what destinations you connect to. It doesn't prevent somebody watching your traffic from learning that you're using Tor. You can mitigate (but not fully resolve) the risk @@ -209,6 +215,7 @@ protection here is a social approach: the more Tor users there are near you and the more <a href="<page about/torusers>">diverse</a> their interests, the less dangerous it will be that you are one of them. + </li> <li> Do not use <a Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-12-24 02:38:37 UTC (rev 25267) +++ website/trunk/download/en/download.wml 2011-12-24 20:39:54 UTC (rev 25268) @@ -286,59 +286,65 @@ <ol> <li> -Tor only protects Internet applications that are configured to send -their traffic through Tor — it doesn't magically anonymize all -your traffic just because you install it. We recommend you use the -<a href="<page projects/torbrowser>">Tor Browser Bundle</a>. It is -pre-configured to protect your privacy and anonymity on the web as long -as you're browsing with Tor Browser. + +Tor only protects Internet applications that are configured to send their +traffic through Tor — it doesn't magically anonymize all of your traffic +just because you install it. We strongly recommend you use the <a href="<page +projects/torbrowser>">Tor Browser Bundle</a>. It is pre-configured to protect +your privacy and anonymity on the web as long as you're browsing with Tor +Browser itself. Almost any other web browser configuration is likely to be +unsafe. Similarly, we do not recommend installing additional addons into the +Tor Browser, as these may bypass Tor or otherwise impede your anonymity. + </li> <li> -Tor Browser and Torbutton block browser plugins such as Java, Flash, + +The Tor Browser will block browser plugins such as Java, Flash, ActiveX, RealPlayer, Quicktime, Adobe's PDF plugin, and others: they can be manipulated into revealing your IP address. For example, that -means Youtube is disabled. If you really need your Youtube, you can <a -href="<page torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> +means Youtube is disabled. If you really need your Youtube, you can +<a href="<page torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> to allow it; but be aware that you're opening yourself up to potential -attack. Also, extensions like Google toolbar look up more information -about the websites you type in: they may bypass Tor and/or broadcast -sensitive information. Some people prefer using two browsers (one for Tor, -one for non-Tor browsing). +attack. + </li> <li> -Beware of cookies: if you ever browse without Tor and a site gives -you a cookie, that cookie could identify you even when you start -using Tor again. Torbutton tries to handle your cookies safely. <a -href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help -protect any cookies you do not want to lose. + +Similarly, the Tor Browser Bundle will warn you before automatically opening +documents that are handled by external applications. DO NOT IGNORE THIS +WARNING. You should be very careful when downloading documents via Tor +(especially DOC and PDF files) as these documents can contain Internet +resources that will be downloaded outside of Tor by the application that +opens them. These documents can be modified by malicious exit nodes, or by +someone who is trying to trick you into revealing your non-Tor IP address. If +you must work with DOC and/or PDF files, we strongly recommend using a +disconnected computer, a <a href="https://www.virtualbox.org/">VirtualBox</a> +free <a href="http://virtualboxes.org/">image</a> with networking disabled, or +<a href="http://tails.boum.org/">Tails</a>. + </li> <li> -Tor anonymizes the origin of your traffic, and it encrypts everything -between you and the Tor network and everything inside the Tor network, -but <a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it -can't encrypt your traffic between the Tor network and its final -destination.</a> If you are communicating sensitive information, you -should use as much care as you would on the normal scary Internet — -use HTTPS or other end-to-end encryption and authentication. <a -href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> is a -Firefox extension produced as a collaboration between The Tor Project -and the Electronic Frontier Foundation. It encrypts your communications -with a number of major websites. + +Tor anonymizes the origin of your traffic, and it encrypts everything between +you and the Tor network and everything inside the Tor network, but +<a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it can't encrypt your traffic +between the Tor network and its final destination.</a> To help ensure +privacy for this last leg, the Tor Browser Bundle includes +<a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to encrypt +your communications with a number of major websites, but you should still +watch the browser URL bar to ensure that websites you provide sensitive information +to display a +<a href="https://support.mozilla.com/en-US/kb/Site%20Identity%20Button">blue or +green validation</a>, include https:// in the URL bar, +and display the proper name for the current website. + </li> <li> -While Tor blocks attackers on your local network from discovering -or influencing your destination, it opens new risks: malicious or -misconfigured Tor exit nodes can send you the wrong page, or even send -you embedded Java applets disguised as domains you trust. Be careful -opening documents or applications you download through Tor, unless you've -verified their integrity. -</li> -<li> Tor tries to prevent attackers from learning what destinations you connect to. It doesn't prevent somebody watching your traffic from learning that you're using Tor. You can mitigate (but not fully resolve) the risk @@ -347,6 +353,7 @@ protection here is a social approach: the more Tor users there are near you and the more <a href="<page about/torusers>">diverse</a> their interests, the less dangerous it will be that you are one of them. + </li> <li> Do not use <a

1 0

[vidalia/master] Fix #4290.
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit e46a569dd7165cab14a3e3cb3e5375410ed11767 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Oct 30 13:56:15 2011 +0500 Fix #4290. Give an error if bridges option is checked and none are specified. --- src/vidalia/config/NetworkPage.cpp | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index 0fa33ca..e67686c 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -317,6 +317,13 @@ NetworkPage::save(QString &errmsg) } settings.setReachablePorts(reachablePorts); + if (ui.chkUseBridges->isChecked()) { + if (ui.listBridges->count() < 1) { + errmsg = tr("You must specify one or more briges."); + return false; + } + } + /* Save the bridge settings */ settings.setUseBridges(ui.chkUseBridges->isChecked()); for (int i = 0; i < ui.listBridges->count(); i++)

1 0

[vidalia/master] Add changes file for bug2943_startfirefox and remove the ones already in the CHANGELOG
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit 6a9b57fc1150be147abcfbadd6e16e20772a6eb7 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 16:53:49 2011 -0300 Add changes file for bug2943_startfirefox and remove the ones already in the CHANGELOG --- changes/bug2188 | 2 -- changes/bug2644 | 3 --- changes/bug2943 | 2 ++ changes/bug3342 | 2 -- changes/bug3759 | 3 --- changes/bug3843 | 2 -- 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/changes/bug2188 b/changes/bug2188 deleted file mode 100644 index 9925519..0000000 --- a/changes/bug2188 +++ /dev/null @@ -1,2 +0,0 @@ - o Draw the bandwidth graph curves based on the local maximum, not - the global maximum. Fixes bug 2188. \ No newline at end of file diff --git a/changes/bug2644 b/changes/bug2644 deleted file mode 100644 index 258b13c..0000000 --- a/changes/bug2644 +++ /dev/null @@ -1,3 +0,0 @@ - o Add an option for setting up a non-exit relay to the Sharing configuration - panel. This is meant to clarify what an exit policy and an exit relay are. - Resolves bug 2644. \ No newline at end of file diff --git a/changes/bug2943 b/changes/bug2943 new file mode 100644 index 0000000..aec285c --- /dev/null +++ b/changes/bug2943 @@ -0,0 +1,2 @@ + o Do not launch Firefox with every CIRCUIT_ESTABLISHED signal, do it + only if Firefox isn't open yet. \ No newline at end of file diff --git a/changes/bug3342 b/changes/bug3342 deleted file mode 100644 index 3b026f5..0000000 --- a/changes/bug3342 +++ /dev/null @@ -1,2 +0,0 @@ - o Display time statistics for bridges in UTC time, rather than local - time. Fixes bug 3342. \ No newline at end of file diff --git a/changes/bug3759 b/changes/bug3759 deleted file mode 100644 index b7dc074..0000000 --- a/changes/bug3759 +++ /dev/null @@ -1,3 +0,0 @@ - o Change the parameter for ordering the entries in the Basic Log - list from currentTime to currentDateTime to avoid missplacing - entries from different days. \ No newline at end of file diff --git a/changes/bug3843 b/changes/bug3843 deleted file mode 100644 index 6ccd062..0000000 --- a/changes/bug3843 +++ /dev/null @@ -1,2 +0,0 @@ - o Check tor version and that settings are sanitized before trying to - use the port autoconfiguration feature. Fixes bug 3843. \ No newline at end of file

1 0

[vidalia/master] Merge remote-tracking branch 'krkhan/bug4290'
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit bd19821a6b64a7943c7c75e50698f253e04ba4f4 Merge: 6a9b57f a841d3b Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 17:04:27 2011 -0300 Merge remote-tracking branch 'krkhan/bug4290' src/vidalia/config/NetworkPage.cpp | 7 +++++++ src/vidalia/help/content/en/config.html | 12 ++++-------- src/vidalia/help/content/po/en/config.po | 14 ++++++-------- src/vidalia/help/content/po/templates/config.pot | 12 ++++-------- 4 files changed, 21 insertions(+), 24 deletions(-)

1 0

[vidalia/master] Add changes file for bug 4290 and improve changes file for bug 2943
by chiiph＠torproject.org 24 Dec '11

24 Dec '11

commit d11540b511548c1ea724730eec4cb0bf574af8f6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Dec 24 17:10:05 2011 -0300 Add changes file for bug 4290 and improve changes file for bug 2943 --- changes/bug2943 | 2 +- changes/bug4290 | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug2943 b/changes/bug2943 index aec285c..ce1c02b 100644 --- a/changes/bug2943 +++ b/changes/bug2943 @@ -1,2 +1,2 @@ o Do not launch Firefox with every CIRCUIT_ESTABLISHED signal, do it - only if Firefox isn't open yet. \ No newline at end of file + only if Firefox isn't open yet. Fixes bug 2943. \ No newline at end of file diff --git a/changes/bug4290 b/changes/bug4290 new file mode 100644 index 0000000..552cf0d --- /dev/null +++ b/changes/bug4290 @@ -0,0 +1,3 @@ + o Do not allow users to check the "My ISP blocks..." checkbox + without entering any bridges. Also updates the + documentation. Fixes bug 4290. \ No newline at end of file

1 0