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

[vidalia/alpha] Don't issue control commands for every single router
by chiiph＠torproject.org 30 May '12

30 May '12

commit 88f5ee89e26ec8e2c8a4b9a5c6cefa8f07f5036d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat May 26 19:22:31 2012 -0300 Don't issue control commands for every single router --- src/vidalia/network/NetViewer.cpp | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 2c6ae47..1571de1 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -401,12 +401,17 @@ NetViewer::preLoadNetworkStatus() ui.lblOffline->setVisible(true); } + bool usingMicrodescriptors = _torControl->useMicrodescriptors(); + foreach(RouterStatus rs, networkStatus) { + if (!_torControl->isConnected()) + return; + if (!rs.isRunning()) continue; RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id()); - if(_torControl->useMicrodescriptors()) { + if(usingMicrodescriptors) { rd.appendRouterStatusInfo(rs); } if (!rd.isEmpty())

1 0

[vidalia/alpha] Merge branch '5519_torcontrol' into alpha
by chiiph＠torproject.org 30 May '12

30 May '12

commit 7c8c7f0b20850048767f0ca4093d92e9d5a59ee8 Merge: 88f5ee8 49c2f16 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun May 27 18:04:18 2012 -0300 Merge branch '5519_torcontrol' into alpha changes/bug5519 | 3 + changes/bug5519.2 | 3 + src/torcontrol/ControlConnection.cpp | 31 +++++--- src/torcontrol/ControlConnection.h | 2 + src/torcontrol/ControlSocket.cpp | 133 +++++++++++++++++++++++++--------- src/torcontrol/ControlSocket.h | 19 +++--- 6 files changed, 135 insertions(+), 56 deletions(-)

1 0

[vidalia/alpha] Fold in changes
by chiiph＠torproject.org 30 May '12

30 May '12

commit 8bfb94e1b989edafe3ace5e4dc7b9ecb99e827b0 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue May 29 23:00:18 2012 -0300 Fold in changes --- CHANGELOG | 201 ++++++++++++++++++++++++++---------------------- changes/authenticated | 2 - changes/automigrate | 3 - changes/bug2925 | 3 - changes/bug3634 | 3 - changes/bug5519 | 3 - changes/bug5519.2 | 3 - changes/bug5690 | 3 - changes/pluginTutorial | 2 - changes/portconf | 3 - changes/raceCondition | 3 - 11 files changed, 110 insertions(+), 119 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a32871b..89728af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,25 +1,26 @@ 0.3.2 ??-???-2012 New features: o In the Network Map window, classify circuits based on their - purpose. This will help users understand that nothing is wrong when - Tor builds a one-hop circuit, for example. Fixes bug 2114. - o In the Message Log window, add an option to filter by search query. - Fixes ticket 2733. + purpose. This will help users understand that nothing is wrong + when Tor builds a one-hop circuit, for example. Fixes bug 2114. + o In the Message Log window, add an option to filter by search + query. Fixes ticket 2733. o Add a new configured relay immediately to the list of relays in the Network Map. Also document why a relay might be offline or not in the consensus/router list. Fixes bug 2735. o Add accounting options to the relay configuration panel. Fixes bug 2944. - o Add a Panic button, for users who want to get rid of the Tor Browser - Bundle quickly in certain circumstances. Note that it uses a simple - erase, rather than a secure erase method. Resolves ticket 4107. + o Add a Panic button, for users who want to get rid of the Tor + Browser Bundle quickly in certain circumstances. Note that it uses + a simple erase, rather than a secure erase method. Resolves ticket + 4107. o Add a way to handle default settings through a file instead of - just the hardcoded values. Vidalia will read a vidalia.defaults.conf - file from the same place as the vidalia.conf file, and override the - hardcoded default if a configuration option and value are listed in - this defaults file. - o Implement a torrc parser and editor and use that to take every - tor configuration option from the vidalia.conf file to the + just the hardcoded values. Vidalia will read a + vidalia.defaults.conf file from the same place as the vidalia.conf + file, and override the hardcoded default if a configuration option + and value are listed in this defaults file. + o Implement a torrc parser and editor and use that to take every tor + configuration option from the vidalia.conf file to the torrc. Vidalia now just needs to know the minimal information to connect to the tor process (ControlPort or ControlSocket and authentication) and everything else would be handled through the @@ -31,6 +32,10 @@ wizard is meant to warn the user about either the Panic feature or that she might need to configure a proxy or a bridge before tor connects to the outside world. Fixes ticket 2905. + o Automigrate TorExecutable, Torrc, DefaultsTorrc and DataDirectory + config options to the new relative path handling. + o Display the relay Nickname and ORPort in the window title when + Vidalia is running as a relay. Fixes bug 3634. Bugfixes relative to Vidalia 0.2.x: o Fix deadlock when the browser process fails to launch in OS X. @@ -71,6 +76,20 @@ upstream git repo. o Always create settings access object, with default section name set to General. Fixes bug 5522. + o Do not send ControlCommands if Vidalia haven't authenticated yet. + o Document how to get started with Vidalia development in a tutorial + fashion. Fixes bug 2925. + o Fix possible infinite loop in ControlConnection object. Fixes bug + 5519. + o Wrapper class for socket access in ControlSocket class. Fixes + ticket 5519. + o Fix possible dangling pointer access in MessageLog at Vidalia + exit. Fixes bug 5690. + o Document how to write plugins in a tutorial fashion. + o Call QCoreApplication::processEvents() while waiting to read + port.conf so that Vidalia does not freeze. + o Make sure there is a ReceiveWaiter in the queue before issuing a + ControlCommand to avoid deadlocks in the event loop. 0.3.1 27-Feb-2012 o Draw the bandwidth graph curves based on the local maximum, not @@ -88,7 +107,7 @@ inside Tor Browser Bundle. o Check tor version and that settings are sanitized before trying to use the port autoconfiguration feature. Fixes bug 3843. - o Provide the necessary fields (Control password, ControlPort) to let + o Provide the necessary fields (Control password, ControlPort) to let TorButton NEWNYM. Vidalia provides these in env vars when it launches the Firefox instance. Resolves bug 2659. o Add an option in the Tor menu to exit the application. Fixes bug @@ -206,18 +225,18 @@ o Vidalia's SVN repository has been migrated to Git. All branches but master have been archived for later review, since SVN trunk had changed significantly; they should be reviewed later to determine whether - they can and should still be merged. All \version $Id$ headers have been + they can and should still be merged. All \version $Id$ headers have been removed since Git does not support $Id$. o As part of the move, Vidalia's Trac is now at: https://trac.torproject.org/ All Trac numbers in Vidalia 0.2.12 and beyond refer to the new Trac entries. The old Trac is archived for posterity at: https://trac-vidalia.torproject.org/projects/vidalia - o Add support for Tor's ControlSocket as an alternative to ControlPort. It - can be used for Linux maintainers to build a better default interaction - between Tor and Vidalia by just setting the right permissions and file - owner on the socket file for the connection. Using ControlSocket means - you don't need to worry about authentication methods with ControlPort. + o Add support for Tor's ControlSocket as an alternative to ControlPort. It + can be used for Linux maintainers to build a better default interaction + between Tor and Vidalia by just setting the right permissions and file + owner on the socket file for the connection. Using ControlSocket means + you don't need to worry about authentication methods with ControlPort. Resolves bug 2091. o Add a way to edit arbitrary torrc entries while Tor is running. Now Vidalia users have more flexibility for configuring Tor. This change @@ -234,7 +253,7 @@ o Fix how the advanced message log window displays message updates when messages are coming in too quickly, for example when you're listening to debug-level messages from Tor. Fixes bug 2093. - o Add a what's this? link to the bridge option to explain in a more verbose + o Add a what's this? link to the bridge option to explain in a more verbose fashion what being a bridge involves. Resolves bug 1995. o Prompt users to restart Tor after changing the path to torrc. Fixes bug 2086. @@ -307,7 +326,7 @@ o Fix compilation on Debian GNU/kFreeBSD. Patch from dererk. o Clean up a couple status event messages related to dangerous port warnings. - o Change the vidalia_ru.nsh output encoding from KOI8-R to Windows-1251. + o Change the vidalia_ru.nsh output encoding from KOI8-R to Windows-1251. (Ticket #527) o Add an option for building an OS X 10.4 compatible binary. @@ -361,7 +380,7 @@ 0.2.3 27-Aug-2009 o Create the data directory before trying to copy over the default - Vidalia configuration file from inside the application bundle on Mac + Vidalia configuration file from inside the application bundle on Mac OS X. Affects only OS X drag-and-drop installer users without a previous Vidalia installation. o Change all Tor event handling to use Qt's signals and slots mechanism @@ -448,18 +467,18 @@ o Remove an old warning on the relay settings page that running a bridge relay requires Tor 0.2.0.8-alpha or newer. o Add a workaround for a bug that prevented Vidalia's tray icon from - getting added to the system notification area on Gnome when Vidalia was + getting added to the system notification area on Gnome when Vidalia was run on system startup. Patch by Steve Tyree. (Ticket #247) o Fix a bug that prevented the control panel from displaying when running on the Enlightenment window manager. Patch by Steve Tyree. o Rename the CMake variables used to store the location of Qt's lupdate - and lrelease executables. Recent versions of CMake decided to use the + and lrelease executables. Recent versions of CMake decided to use the same variable name, which was stomping on mine, resulting in the wrong lupdate and lrelease executables being used. o Use the TorProcess subclass of QProcess for launching Tor when hashing a control password so we can take advantage of its PATH+=:/usr/sbin trick on Debian there too. - o If a RouterDescriptor object is empty, don't try to display it in the + o If a RouterDescriptor object is empty, don't try to display it in the router descriptor details viewer. (Ticket #479) o Wait until Vidalia has registered for log events via the control port before ignoring Tor's output on stdout. Previously we would start @@ -480,7 +499,7 @@ the user the option to disable future warnings. o Add an interface for displaying the geographic distribution of clients who have recently used a bridge operator's relay. - o Add tooltips to tree items in the help browser's table of contents. Some + o Add tooltips to tree items in the help browser's table of contents. Some of the help topic labels are a bit long. o Switch to a simpler About dialog and move the license information to a separate HTML-formatted display. @@ -544,9 +563,9 @@ 0.1.9 02-Sep-2008 - o Create the control panel's menubar as a parentless QMenuBar, so it is + o Create the control panel's menubar as a parentless QMenuBar, so it is visible even if the control panel is not the topmost window. (Ticket #286) - o Add a context menu with a "copy" option to RouterDescriptorView? so + o Add a context menu with a "copy" option to RouterDescriptorView? so users can copy some text to the clipboard. (Ticket #291) o Make the Tor status label and Vidalia tray icon tooltip display the same text after a circuit is established. (Ticket #390) @@ -555,7 +574,7 @@ o Try to load a translation for the current language from Qt's translations directory, so we can get Qt's internal widgets (e.g. QDialogButtonBox) translated. (Ticket #375) - o Use "$\r$\n" in the MessageBox strings in the Windows installer + o Use "$\r$\n" in the MessageBox strings in the Windows installer translations, so the newlines appear properly. (Ticket #411) o Grab the Qt .dlls included in the Vidalia installer directly from the configured Qt binary directory (as specified by ${QT_BINARY_DIR}). @@ -567,29 +586,29 @@ configurable CMake options so the bundle can be built without having to shimmy all these files into some specific directory hierarchy. Makes the bundle a bit less annoying to build. - o Use the architecture name (e.g. "universal" or "ppc") rather than the + o Use the architecture name (e.g. "universal" or "ppc") rather than the OS X version name (e.g. "tiger" or "panther") when naming OS X packages. o Update the INSTALL file to recommend out-of-source builds. - o Stop building the nsh2po and po2nsh conversion tools on non-Windows + o Stop building the nsh2po and po2nsh conversion tools on non-Windows platforms. 0.1.8 17-Aug-2008 - o Make the position of the y-axis on the bandwidth graph variable based on - the width of the axis labels. This works better for languages like Farsi + o Make the position of the y-axis on the bandwidth graph variable based on + the width of the axis labels. This works better for languages like Farsi where "KB/s" somehow becomes 19 characters. (Ticket #373) o Support alphanumeric circuit and stream IDs, rather than assuming IDs will - always be numeric. Current Tors only use numeric circuit and stream IDs, + always be numeric. Current Tors only use numeric circuit and stream IDs, but they may some day. (Ticket #400) o Include ssleay32.dll in the Windows packages so Vidalia won't crash when - it finds an incompatible version of ssleay32.dll in the user's $PATH. + it finds an incompatible version of ssleay32.dll in the user's $PATH. (Ticket #401) - o If the message log is sorted by severity or lexiographically, or if the - user manually repositioned the vertical scroll bar, then retain the scroll + o If the message log is sorted by severity or lexiographically, or if the + user manually repositioned the vertical scroll bar, then retain the scroll bar's previous position after adding a new message to the log. o If the current message log layout is right-to-left (e.g. if the user's translation is Farsi), then use a custom item delegate for the log message - column whose sole purpose is to keep Qt from screwing with the message + column whose sole purpose is to keep Qt from screwing with the message text. (Ticket #396) o Reduce the default number of messages to retain in the message log to 50 messages. Most people never look at the window and the extra 200 messages @@ -598,10 +617,10 @@ context menus. They were lost in the move to the Oxygen icon theme in 0.1.4. o Make both the 'Ctrl+W' and 'Esc' shortcuts for closing any Vidalia window. - Previously, it was just 'Esc' on Windows and 'Ctrl+W' on all other + Previously, it was just 'Esc' on Windows and 'Ctrl+W' on all other platforms. - o Make pressing "Return" mean the same thing as clicking 'OK' in the - config dialog, and make pressing 'Esc' mean the same thing as clicking + o Make pressing "Return" mean the same thing as clicking 'OK' in the + config dialog, and make pressing 'Esc' mean the same thing as clicking 'Cancel'. (Ticket #327) o Fix the icon used for the help browser's window icon. @@ -625,7 +644,7 @@ LangString entries from an NSIS file and generate a .po file. This was used to help push our installer translations into Pootle. o Add a po2nsh tool to convert the Windows installer .po files to NSIS .nsh - files at build time. + files at build time. o Tell CMake to skip the pkg/ subdirectories that aren't likely to be needed on the current build platform. o Updated Czech, French, and German translations. @@ -638,7 +657,7 @@ uses to write out the .ts file. This resulted in garbled characters when viewing some translations on apparently all platforms except OS X. o Use the correct field when trying to parse the severity value from the - 'getinfo status/bootstrap-phase' response. + 'getinfo status/bootstrap-phase' response. o Fix compilation of the ts2po and po2ts conversion tools on OS X Panther. o Tweak the ts2po and po2ts dependencies so Vidalia can be built with Xcode on OS X again. @@ -693,7 +712,7 @@ to use Tor. o Apply some Tor trademark compliance updates to user-visible strings. o Cut down the margin around the table of contents in the help browser. It - looked goofy with so much empty space. + looked goofy with so much empty space. o Update Finnish, Spanish, and Swedish translations. @@ -846,7 +865,7 @@ automatically on login for the user that installed the bundle. o Added an Arabic translation from Ahmad Gharbeia. o Updated Finnish, German, Simplified Chinese, and Traditional Chinese - translations. + translations. 0.0.15 24-Oct-2007 @@ -919,7 +938,7 @@ o Add some information to the help browser about the new network settings and bridge relay configuration, as well as the new authentication settings in 0.0.14. - o When the user clicks the Help button in the Settings dialog, take them + o When the user clicks the Help button in the Settings dialog, take them directly to the help topic for whichever settings page they are currently viewing. o Added Torbutton 1.1.9.1-alpha to the Mac OS X bundles, thanks to @@ -962,7 +981,7 @@ simply load the documentation from the English version. o Use RelayBandwidthBurst and RelayBandwidthRate on Tor >= 0.2.0.1-alpha. o Remove from the server config page the 'Address' text box, the 'Get - Address' button, and 'Automatically Update' checkbox. + Address' button, and 'Automatically Update' checkbox. o Don't do balloon messages on Windows 2000; I'm told it doesn't work even though QSystemTrayIcon::supportsMessages() says it should. o Removed a duplicate check when determining what control event Vidalia @@ -980,8 +999,8 @@ o Added a Swedish GUI and installer translation from Amin Amini. o Added an Italian installer translation from Alex Mazzariol. o Update Finnish, French, German, Italian, Russian and Spanish translations. - - + + 0.0.12 01-Jun-2007 o Added a new "Control Panel" main window that appears when Vidalia first starts. This dialog is for people who either aren't trained to look in @@ -1009,7 +1028,7 @@ don't waste memory on a window the user might never use. o Fix a minor bug that's been around since 0.0.1: actually remove objects from the list of targets for an event, instead of from a copy of the list. - o Display command-line options information as a message box so even Win32 + o Display command-line options information as a message box so even Win32 folks can see it, if they give Vidalia a bogus argument. o Revert back to the single uninstaller strategy on Win32, so don't leave program groups behind after uninstalling the bundle. (Ticket #237) @@ -1017,7 +1036,7 @@ after completing the Win32 installer. o Don't skip past the Win32 installer results immediately, since there could have been errors the user should see. - o Include a default.action file for Privoxy in the Win32 and OS X bundles + o Include a default.action file for Privoxy in the Win32 and OS X bundles with the +limit-connect{1-} fix. o Include some more helpful text in the Win32 installer welcome screen and category descriptions. @@ -1026,28 +1045,28 @@ X bundle. (Ticket #230) o Updated Dutch, Finnish, French, German, Norwegian, Polish and Spanish translations. - + 0.0.11 07-Feb-2007 o Fix a race condition that could (and did) cause Vidalia to freeze. - o RESETCONF all server-related settings when the be-a-server checkbox gets + o RESETCONF all server-related settings when the be-a-server checkbox gets unchecked, not just ORPort and Nickname. - o Add support for zlib or gzip compressed GeoIP responses. + o Add support for zlib or gzip compressed GeoIP responses. o Handle chunked transfer encodings properly in GeoIP responses. o Be a little less eager to send GeoIP requests right away. Now we wait 10 seconds after adding an address to the queue, or a maximum of 30 seconds, before sending the request. o Tolerate entries in geoip-cache that have no timestamp. If an entry does - not have a timestamp, use the current date and time. + not have a timestamp, use the current date and time. o Respond to double-clicks on the map. Double left-click zooms in towards the mouse pointer and double right-click zooms out. - o If Vidalia is built with Qt >= 4.2, use the open and closed hand cursors + o If Vidalia is built with Qt >= 4.2, use the open and closed hand cursors in ZImageView when panning the world map. - o Qt >= 4.2 handles the sorting in addTopLevelItem() in the server list. We - still do the sorted inserts ourselves in older Qts. - o Display circuits as a list of server nicknames (like we currently do), but + o Qt >= 4.2 handles the sorting in addTopLevelItem() in the server list. We + still do the sorted inserts ourselves in older Qts. + o Display circuits as a list of server nicknames (like we currently do), but save the original circuit paths (possibly with key IDs for non-Named - servers) so we don't display the wrong server information when the user + servers) so we don't display the wrong server information when the user selects that circuit. o Fix a bug introduced in 0.0.10 that caused a server's little pinpoint on the map to not be highlighted green when the server is selected in the @@ -1056,16 +1075,16 @@ NEW stream events. o Add an EU flag for the server list. o Add a "Cancel" button to the message box that asks server operators if - they want to delay server shutdown or kill Tor right away. (Ticket #222) + they want to delay server shutdown or kill Tor right away. (Ticket #222) o Add version information to our compiled Win32 vidalia.exe. - o Be more tolerant of Win32 people removing the Tor service out from under + o Be more tolerant of Win32 people removing the Tor service out from under Vidalia. o Explicitly specify the tab order in the bandwidth graph. o Fix a bug in parsing Tor's version string when it contains modifiers such as '-alpha'. o Make Circuit::hops() correctly return an empty QStringList for empty paths, instead of a QStringList with one empty QString. - o Do a better job of detecting Qt 4.2 debug libs on OS X. There were a few + o Do a better job of detecting Qt 4.2 debug libs on OS X. There were a few necessary non-Qt libs missing from LIBS when we did our AC_TRY_LINK. o Add vidalia.spec to our configure.in, so the RPM spec file stays current. o Add a Traditional Chinese installer and GUI translation from Cloud. @@ -1075,17 +1094,17 @@ 0.0.10 25-Dec-2006 o Load NT service functions on demand so we can run on Windows 95/98/ME again. (Ticket #211) - o Add a column to the list of servers in the network map window, with a - little flag icon for each server. + o Add a column to the list of servers in the network map window, with a + little flag icon for each server. o If the network map window is not visible, queue all GeoIP requests until either the window becomes visible again or the queue contains requests for at least one-quarter of all known servers. o If we get a valid geoip response telling us the geoip database doesn't - have a location for the requested IP address, cache that response for one - week so we don't keep sending requests that are likely to fail anyway. - o Use QSystemTrayIcon when available (except on Mac). If we are using - QSystemTrayIcon on systems that support balloon messages, use a balloon to - indicate when NEWNYM is successful. We still show a message box when NEWNYM + have a location for the requested IP address, cache that response for one + week so we don't keep sending requests that are likely to fail anyway. + o Use QSystemTrayIcon when available (except on Mac). If we are using + QSystemTrayIcon on systems that support balloon messages, use a balloon to + indicate when NEWNYM is successful. We still show a message box when NEWNYM fails. (Ticket #183) o Add a graph style dropdown box to the bandwidth graph settings, so you can choose between a fancy alpha blended area graph and a faster, simpler line @@ -1097,8 +1116,8 @@ o Add a "Zoom to Circuit" option to the circuit context menu in the network map's list of circuits. o Add a context menu to the dock icon on OS X. (Ticket #135) - o If we're building with Qt >= 4.2.0, then use its new saveGeometry() and - restoreGeometry() functions to save and restore window size and position. + o If we're building with Qt >= 4.2.0, then use its new saveGeometry() and + restoreGeometry() functions to save and restore window size and position. If we're still using an old Qt, make sure the window fits on screen when we try to restore it. (Ticket #207) o Fix a bug in how the server points were keyed on the network map that @@ -1119,7 +1138,7 @@ o Add a Spanish translation contributed by desolator. o Add a Portuguese (Brazilian) translation contributed by Mabat Haram. o Add a Simplified Chinese installer translation contributed by omg. - o Updates to Finnish, French, German, Italian, Norwegian, Polish, + o Updates to Finnish, French, German, Italian, Norwegian, Polish, Russian, and Simplified Chinese translations. @@ -1129,13 +1148,13 @@ o Improved our ./configure script so it will detect old or non-debug versions of Qt and link accordingly. o Added support for more easily building Qt as a Universal binary on OS X. - o Added a right-click option to circuits listed in the network map dialog to + o Added a right-click option to circuits listed in the network map dialog to close the circuit (Ticket #176). - o Added a right-click option to servers listed in the network map dialog to + o Added a right-click option to servers listed in the network map dialog to zoom in on the server on the map (Ticket #176). o Stop using a custom font and just use the platform default on all dialogs. o Add "Close Window" shortcuts for Linux (Ctrl+W). - o Fixed a crash bug that would occur when saving messages in the message + o Fixed a crash bug that would occur when saving messages in the message log (Ticket #185). o Fixed a bug that would cause messages with identical timestamps to not get copied to the clipboard (Ticket #190). @@ -1146,12 +1165,12 @@ down; just stop Tor and exit immediately so Windows doesn't yell at us. o Detect if Tor was installed as an NT service prior to Vidalia, so we don't accidentally remove it. - o Create a new torrc and specify a control port for the Tor NT service, so + o Create a new torrc and specify a control port for the Tor NT service, so it doesn't die when the user tries to start the service and we don't have to tell the user to go add a line to their torrc. o Fixed a bug that caused Vidalia to crash if it tried to read in a bogus geoip-cache file from its data directory (Ticket #184). - o Refuse to cache information we did not ask for that we received in response + o Refuse to cache information we did not ask for that we received in response to a GeoIP request. o Wait no more than ten seconds after queueing a GeoIP request before sending it, so requests don't starve if we keep constantly getting new @@ -1172,8 +1191,8 @@ ControlPort, Vidalia will "attach" to that Tor instead of starting a new process. o Vidalia now supports running Tor as an NT service on Windows. - o When Vidalia starts its own Tor process, it will now default to starting it - with a "-f ~/.vidalia/torrc", to avoid permissions conflicts when running + o When Vidalia starts its own Tor process, it will now default to starting it + with a "-f ~/.vidalia/torrc", to avoid permissions conflicts when running Tor as a user that does not have write access to the default torrc. The torrc used when starting Tor is still configurable. o Fix a bug that was causing unexpected behavior with many unrelated Windows @@ -1181,11 +1200,11 @@ o Do a better job of determining if another Vidalia process is running on Windows, to eliminate all the false positives reported. o Major performance improvements related to loading the network map. - o Support receiving server identities in circ events, as well as names, so + o Support receiving server identities in circ events, as well as names, so Vidalia will work with Tor 0.1.2.2-alpha and later. o Moved the "New Identity" button to the main popup menu for easier access. - o Vidalia dialogs remember their last size and location when Vidalia exits + o Vidalia dialogs remember their last size and location when Vidalia exits and restore their size and location the next time Vidalia runs. o Vidalia windows now close in response to a Command-W on Mac OS X. o Added a "Zoom To Fit" button to the network map, to zoom in on the active @@ -1202,14 +1221,14 @@ o Updates to the Finnish, French, and Russian translations. -0.0.7 07-Jul-2006 +0.0.7 07-Jul-2006 o Fix a bug that was causing Vidalia to freeze frequently for some people, particularly when running at a verbose log level. o Fix a bug that would cause Windows Vidalias to not want to start after Vidalia had been killed via the Task Manager. o Add a French translation contributed by Michel Burkhardt. o In the network map, update the displayed uptime by looking at the difference - between now and the publication time, and add that difference to the published + between now and the publication time, and add that difference to the published uptime. @@ -1237,8 +1256,8 @@ o Add an Italian translation contributed by Alex Mazzariol. o Add a Russian translation contributed by ygrek. o Add a manpage for Vidalia contributed by Alexander Wirt. - - + + 0.0.5 02-Jun-2006 o Make the "Always On Top" property of the bandwidth graph optional. o Add a new dialog showing a list of routers that the user's Tor currently @@ -1273,13 +1292,13 @@ o Be smarter about guessing the default location of Tor in non-English Windowses. - + 0.0.3 13-Apr-2006 o Fixed a server configuration bug that caused people to not really be a middleman node, even though the checkbox told them they were. o Fixed a bug in choosing a default language that caused help documents to sometimes not appear. - o Fixed the Win32 bundle installer to not leave 2 files and a registry key + o Fixed the Win32 bundle installer to not leave 2 files and a registry key laying around after an uninstall. Also give users the option of launching Vidalia when the solo installer is finished. o Fixed a bug where Vidalia would ignore Windows when asked to shut down @@ -1290,7 +1309,7 @@ o Improved help document accessibility by adding "Help" buttons to many dialogs and error message boxes. - + 0.0.2 02-Apr-2006 o Added an integrated help browser and documentation. o Added exit policy configuration support for servers. @@ -1299,7 +1318,7 @@ o Added support for changing Vidalia's interface style. o Aesthetic improvements in many dialogs. - + 0.0.1 28-Feb-2006 o Initial testing release. o Basic features include: diff --git a/changes/authenticated b/changes/authenticated deleted file mode 100644 index 905b6c7..0000000 --- a/changes/authenticated +++ /dev/null @@ -1,2 +0,0 @@ - Internal cleanups and improvements: - o Do not send ControlCommands if Vidalia haven't authenticated yet. \ No newline at end of file diff --git a/changes/automigrate b/changes/automigrate deleted file mode 100644 index 8d019a1..0000000 --- a/changes/automigrate +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Automigrate TorExecutable, Torrc, DefaultsTorrc and DataDirectory - config options to the new relative path handling. \ No newline at end of file diff --git a/changes/bug2925 b/changes/bug2925 deleted file mode 100644 index 350b802..0000000 --- a/changes/bug2925 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Document how to get started with Vidalia development in a tutorial - fashion. Fixes bug 2925. \ No newline at end of file diff --git a/changes/bug3634 b/changes/bug3634 deleted file mode 100644 index 6f17d8a..0000000 --- a/changes/bug3634 +++ /dev/null @@ -1,3 +0,0 @@ - New features: - o Display the relay Nickname and ORPort in the window title when - Vidalia is running as a relay. Fixes bug 3634. diff --git a/changes/bug5519 b/changes/bug5519 deleted file mode 100644 index 461fd6b..0000000 --- a/changes/bug5519 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Fix possible infinite loop in ControlConnection - object. Fixes bug 5519. diff --git a/changes/bug5519.2 b/changes/bug5519.2 deleted file mode 100644 index e619fc7..0000000 --- a/changes/bug5519.2 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Wrapper class for socket access in ControlSocket - class. Fixes ticket 5519. diff --git a/changes/bug5690 b/changes/bug5690 deleted file mode 100644 index a958e6b..0000000 --- a/changes/bug5690 +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Fix possible dangling pointer access in MessageLog at - Vidalia exit. Fixes bug 5690. diff --git a/changes/pluginTutorial b/changes/pluginTutorial deleted file mode 100644 index 5babab3..0000000 --- a/changes/pluginTutorial +++ /dev/null @@ -1,2 +0,0 @@ - Internal cleanups and improvements: - o Document how to write plugins in a tutorial fashion. \ No newline at end of file diff --git a/changes/portconf b/changes/portconf deleted file mode 100644 index 74be88a..0000000 --- a/changes/portconf +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Call QCoreApplication::processEvents() while waiting to read - port.conf so that Vidalia does not freeze. \ No newline at end of file diff --git a/changes/raceCondition b/changes/raceCondition deleted file mode 100644 index 82e4b3c..0000000 --- a/changes/raceCondition +++ /dev/null @@ -1,3 +0,0 @@ - Internal cleanups and improvements: - o Make sure there is a ReceiveWaiter in the queue before issuing a - ControlCommand to avoid deadlocks in the event loop. \ No newline at end of file

1 0

[vidalia/alpha] Automigrate TorExecutable, Torrc, DefaultsTorrc and DataDirectory to the new path handling
by chiiph＠torproject.org 30 May '12

30 May '12

commit 1f2b1f3bcd63d12b0b3e1fabf2c7617fb76737a9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue May 29 22:53:46 2012 -0300 Automigrate TorExecutable, Torrc, DefaultsTorrc and DataDirectory to the new path handling --- changes/automigrate | 3 ++ src/vidalia/MainWindow.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/changes/automigrate b/changes/automigrate new file mode 100644 index 0000000..8d019a1 --- /dev/null +++ b/changes/automigrate @@ -0,0 +1,3 @@ + New features: + o Automigrate TorExecutable, Torrc, DefaultsTorrc and DataDirectory + config options to the new relative path handling. \ No newline at end of file diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 90e8706..02a41da 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -647,7 +647,38 @@ MainWindow::start() } QString torrc = settings.getTorrc(); + QFileInfo torrcInfo(torrc); + + if(QDir(torrcInfo.filePath()).isRelative()) { + torrc = QCoreApplication::applicationDirPath() + "/" + torrc; + + QFileInfo newTorrcInfo(torrc); + if(!newTorrcInfo.exists() and torrcInfo.exists()) { + torrc = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrcInfo.absoluteFilePath()); + vWarn("Automigrating configuration for Torrc:\nOld path: %1\nNew path: %2") + .arg(newTorrcInfo.filePath()) + .arg(torrc); + settings.setTorrc(torrc); + torrc = QCoreApplication::applicationDirPath() + "/" + torrc; + } + } + QString torrc_defaults = settings.getDefaultsTorrc(); + QFileInfo torrc_defaultsInfo(torrc_defaults); + + if(QDir(torrc_defaultsInfo.filePath()).isRelative()) { + torrc_defaults = QCoreApplication::applicationDirPath() + "/" + torrc_defaults; + + QFileInfo newTorrc_DefaultsInfo(torrc_defaults); + if(!newTorrc_DefaultsInfo.exists() and torrc_defaultsInfo.exists()) { + torrc_defaults = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrc_defaultsInfo.absoluteFilePath()); + vWarn("Automigrating configuration for DefaultsTorrc:\nOld path: %1\nNew path: %2") + .arg(newTorrc_DefaultsInfo.filePath()) + .arg(torrc_defaults); + settings.setDefaultsTorrc(torrc_defaults); + torrc_defaults = QCoreApplication::applicationDirPath() + "/" + torrc_defaults; + } + } if(settings.bootstrap()) { QString boottorrc = settings.bootstrapFrom(); @@ -675,8 +706,21 @@ MainWindow::start() /* Specify Tor's data directory, if different from the default */ QString dataDirectory = settings.getDataDirectory(); - if(QDir(dataDirectory).isRelative()) + QFileInfo dataDirectoryInfo(dataDirectory); + + if(QDir(dataDirectory).isRelative()) { dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + QFileInfo newDataDirectoryInfo(dataDirectory); + if(!newDataDirectoryInfo.exists() and dataDirectoryInfo.exists()) { + dataDirectory = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(dataDirectoryInfo.absoluteFilePath()); + vWarn("Automigrating configuration for DataDirectory:\nOld path: %1\nNew path: %2") + .arg(newDataDirectoryInfo.absoluteFilePath()) + .arg(dataDirectory); + settings.setDataDirectory(dataDirectory); + dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + } + } + QString expDataDirectory = expand_filename(dataDirectory); if(settings.getControlMethod() == ControlMethod::Port) { @@ -724,8 +768,22 @@ MainWindow::start() _isIntentionalExit = true; /* Kick off the Tor process */ QString torExecutable = settings.getExecutable(); - if(QDir(QFileInfo(torExecutable).filePath()).isRelative()) + QFileInfo torExecutableInfo(torExecutable); + + if(QDir(torExecutableInfo.filePath()).isRelative()) { torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; + + QFileInfo newTorExecutableInfo(torExecutable); + if(!newTorExecutableInfo.exists() and torExecutableInfo.exists()) { + torExecutable = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torExecutableInfo.absoluteFilePath()); + vWarn("Automigrating configuration for TorExecutable:\nOld path: %1\nNew path: %2") + .arg(newTorExecutableInfo.filePath()) + .arg(torExecutable); + settings.setExecutable(torExecutable); + torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; + } + } + _torControl->start(torExecutable, args); QString errmsg;

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 29 May '12

29 May '12

commit c35bf5c65ea5bceb980859292f3805c93c020a32 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 29 21:45:07 2012 +0000 Update translations for tsum_completed --- nl/short-user-manual_nl_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nl/short-user-manual_nl_noimg.xhtml b/nl/short-user-manual_nl_noimg.xhtml index 1e91b32..45bfbbc 100644 --- a/nl/short-user-manual_nl_noimg.xhtml +++ b/nl/short-user-manual_nl_noimg.xhtml @@ -22,7 +22,7 @@ <p><strong>Noot</strong>: De Tor Browser Bundle voor Linux en Mac OS X zijn vrij groot en je kunt deze bundels niet ontvangen met een Gmail, Hotmail of Yahoo account. Als je de bundel die je wilt niet kunt ontvangen, stuur een e-mail naar help(a)rt.torproject.org en we sturen je een lijst met website mirrors om te gebruiken.</p> <h3 id="tor-for-smartphones">Tor voor smartphones</h3> <p>Je kan Tor op je Android toestel krijgen door het pakket <em>Orbot</em> the installeren. Voor informatie over hoe Orbot te downloaden en te installeren, kijk op de <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p> - <p>We hebben ook experimentele pakketten voor <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> en <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p> + <p>We hebben ook experimentele pakketten voor <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> en <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p> <h3 id="how-to-verify-that-you-have-the-right-version">Hoe te verifiëren dat je de juiste versie hebt</h3> <p>Voordat je de Tor Browser Bundle uitvoert moet je er zeker van zijn dat je de juiste versie hebt.</p> <p>De software die je ontvangt, wordt vergezeld door een bestand met dezelfde naam als de bundel en de extensie <strong>.asc</strong>. Dit .asc bestand is een GPG handtekening en stelt je in staat om te verifiëren dat het bestand dat je hebt gedownload precies diegene is die we bedoelden voor jou om te ontvangen.</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 May '12

29 May '12

commit e1d2ff06f9c5164a0c39266b61d5213e52db9996 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 29 21:45:06 2012 +0000 Update translations for tsum --- nl/short-user-manual_nl_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nl/short-user-manual_nl_noimg.xhtml b/nl/short-user-manual_nl_noimg.xhtml index c12e9ca..45bfbbc 100644 --- a/nl/short-user-manual_nl_noimg.xhtml +++ b/nl/short-user-manual_nl_noimg.xhtml @@ -22,7 +22,7 @@ <p><strong>Noot</strong>: De Tor Browser Bundle voor Linux en Mac OS X zijn vrij groot en je kunt deze bundels niet ontvangen met een Gmail, Hotmail of Yahoo account. Als je de bundel die je wilt niet kunt ontvangen, stuur een e-mail naar help(a)rt.torproject.org en we sturen je een lijst met website mirrors om te gebruiken.</p> <h3 id="tor-for-smartphones">Tor voor smartphones</h3> <p>Je kan Tor op je Android toestel krijgen door het pakket <em>Orbot</em> the installeren. Voor informatie over hoe Orbot te downloaden en te installeren, kijk op de <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p> - <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p> + <p>We hebben ook experimentele pakketten voor <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> en <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p> <h3 id="how-to-verify-that-you-have-the-right-version">Hoe te verifiëren dat je de juiste versie hebt</h3> <p>Voordat je de Tor Browser Bundle uitvoert moet je er zeker van zijn dat je de juiste versie hebt.</p> <p>De software die je ontvangt, wordt vergezeld door een bestand met dezelfde naam als de bundel en de extensie <strong>.asc</strong>. Dit .asc bestand is een GPG handtekening en stelt je in staat om te verifiëren dat het bestand dat je hebt gedownload precies diegene is die we bedoelden voor jou om te ontvangen.</p>

1 0

[metrics-db/master] Merge Torperf files into new .tpf file format.
by karsten＠torproject.org 29 May '12

29 May '12

commit 8b45d2fb00af489e4ff9ebb74a892e5f91485844 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 24 09:34:26 2012 +0200 Merge Torperf files into new .tpf file format. Implements part of #3036. --- config.template | 12 +- src/org/torproject/ernie/db/Configuration.java | 39 +-- src/org/torproject/ernie/db/Main.java | 3 +- src/org/torproject/ernie/db/TorperfDownloader.java | 484 ++++++++++++++++++-- 4 files changed, 467 insertions(+), 71 deletions(-) diff --git a/config.template b/config.template index 5034e12..aecc67d 100644 --- a/config.template +++ b/config.template @@ -136,11 +136,9 @@ ## times) #TorperfSource torperf http://torperf.torproject.org/ # -## Torperf .data files available on a given source (option can be -## contained multiple times) -#TorperfDataFiles torperf 50kb.data 1mb.data 5mb.data -# -## Torperf .extradata files available on a given source (option can be -## contained multiple times) -#TorperfExtradataFiles torperf 50kb.extradata 1mb.extradata 5mb.extradata +## Torperf measurement file size in bytes, .data file, and .extradata file +## available on a given source (option can be contained multiple times) +#TorperfFiles torperf 51200 50kb.data 50kb.extradata +#TorperfFiles torperf 1048576 1mb.data 1mb.extradata +#TorperfFiles torperf 5242880 5mb.data 5mb.extradata diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java index 6ab9f44..63349c8 100644 --- a/src/org/torproject/ernie/db/Configuration.java +++ b/src/org/torproject/ernie/db/Configuration.java @@ -59,8 +59,7 @@ public class Configuration { private boolean processTorperfFiles = false; private String torperfOutputDirectory = "torperf/"; private SortedMap<String, String> torperfSources = null; - private SortedMap<String, List<String>> torperfDataFiles = null; - private SortedMap<String, List<String>> torperfExtradataFiles = null; + private List<String> torperfFiles = null; private boolean provideFilesViaRsync = false; private String rsyncDirectory = "rsync"; public Configuration() { @@ -194,29 +193,18 @@ public class Configuration { String sourceName = parts[1]; String baseUrl = parts[2]; this.torperfSources.put(sourceName, baseUrl); - } else if (line.startsWith("TorperfDataFiles")) { - if (this.torperfDataFiles == null) { - this.torperfDataFiles = new TreeMap<String, List<String>>(); + } else if (line.startsWith("TorperfFiles")) { + if (this.torperfFiles == null) { + this.torperfFiles = new ArrayList<String>(); } String[] parts = line.split(" "); - String sourceName = parts[1]; - List<String> dataFiles = new ArrayList<String>(); - for (int i = 2; i < parts.length; i++) { - dataFiles.add(parts[i]); - } - this.torperfDataFiles.put(sourceName, dataFiles); - } else if (line.startsWith("TorperfExtradataFiles")) { - if (this.torperfExtradataFiles == null) { - this.torperfExtradataFiles = - new TreeMap<String, List<String>>(); - } - String[] parts = line.split(" "); - String sourceName = parts[1]; - List<String> extradataFiles = new ArrayList<String>(); - for (int i = 2; i < parts.length; i++) { - extradataFiles.add(parts[i]); + if (parts.length != 5) { + logger.severe("Configuration file contains TorperfFiles " + + "option with wrong number of values in line '" + line + + "'! Exiting!"); + System.exit(1); } - this.torperfExtradataFiles.put(sourceName, extradataFiles); + this.torperfFiles.add(line); } else if (line.startsWith("ProvideFilesViaRsync")) { this.provideFilesViaRsync = Integer.parseInt( line.split(" ")[1]) != 0; @@ -381,11 +369,8 @@ public class Configuration { public SortedMap<String, String> getTorperfSources() { return this.torperfSources; } - public SortedMap<String, List<String>> getTorperfDataFiles() { - return this.torperfDataFiles; - } - public SortedMap<String, List<String>> getTorperfExtradataFiles() { - return this.torperfExtradataFiles; + public List<String> getTorperfFiles() { + return this.torperfFiles; } public boolean getProvideFilesViaRsync() { return this.provideFilesViaRsync; diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java index e44eac0..4fa9e37 100644 --- a/src/org/torproject/ernie/db/Main.java +++ b/src/org/torproject/ernie/db/Main.java @@ -139,8 +139,7 @@ public class Main { // Process Torperf files if (config.getProcessTorperfFiles()) { new TorperfDownloader(new File(config.getTorperfOutputDirectory()), - config.getTorperfSources(), config.getTorperfDataFiles(), - config.getTorperfExtradataFiles()); + config.getTorperfSources(), config.getTorperfFiles()); } // Copy recently published files to a local directory that can then diff --git a/src/org/torproject/ernie/db/TorperfDownloader.java b/src/org/torproject/ernie/db/TorperfDownloader.java index 8ee0fe9..e7c55a1 100644 --- a/src/org/torproject/ernie/db/TorperfDownloader.java +++ b/src/org/torproject/ernie/db/TorperfDownloader.java @@ -11,65 +11,172 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.text.SimpleDateFormat; import java.util.List; import java.util.Map; import java.util.SortedMap; +import java.util.TimeZone; +import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; /* Download possibly truncated Torperf .data and .extradata files from - * configured sources and append them to the files we already have. */ + * configured sources, append them to the files we already have, and merge + * the two files into the .tpf format. */ public class TorperfDownloader { private File torperfOutputDirectory = null; private SortedMap<String, String> torperfSources = null; - private SortedMap<String, List<String>> torperfDataFiles = null; - private SortedMap<String, List<String>> torperfExtradataFiles = null; + private List<String> torperfFilesLines = null; private Logger logger = null; + private SimpleDateFormat dateFormat; public TorperfDownloader(File torperfOutputDirectory, SortedMap<String, String> torperfSources, - SortedMap<String, List<String>> torperfDataFiles, - SortedMap<String, List<String>> torperfExtradataFiles) { + List<String> torperfFilesLines) { if (torperfOutputDirectory == null) { throw new IllegalArgumentException(); } this.torperfOutputDirectory = torperfOutputDirectory; this.torperfSources = torperfSources; - this.torperfDataFiles = torperfDataFiles; - this.torperfExtradataFiles = torperfExtradataFiles; + this.torperfFilesLines = torperfFilesLines; if (!this.torperfOutputDirectory.exists()) { this.torperfOutputDirectory.mkdirs(); } this.logger = Logger.getLogger(TorperfDownloader.class.getName()); - this.downloadAndMergeFiles(this.torperfDataFiles, true); - this.downloadAndMergeFiles(this.torperfExtradataFiles, false); + this.dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + this.readLastMergedTimestamps(); + for (String torperfFilesLine : this.torperfFilesLines) { + this.downloadAndMergeFiles(torperfFilesLine); + } + this.writeLastMergedTimestamps(); } - private void downloadAndMergeFiles( - SortedMap<String, List<String>> dataOrExtradataFiles, - boolean isDataFile) { - for (Map.Entry<String, List<String>> e : - dataOrExtradataFiles.entrySet()) { - String sourceName = e.getKey(); - String sourceBaseUrl = torperfSources.get(sourceName); - List<String> files = e.getValue(); - for (String file : files) { - String url = sourceBaseUrl + file; - File outputFile = new File(torperfOutputDirectory, - sourceName + "-" + file); - this.downloadAndMergeFile(url, outputFile, isDataFile); + private File torperfLastMergedFile = + new File("stats/torperf-last-merged"); + SortedMap<String, String> lastMergedTimestamps = + new TreeMap<String, String>(); + private void readLastMergedTimestamps() { + if (!this.torperfLastMergedFile.exists()) { + return; + } + try { + BufferedReader br = new BufferedReader(new FileReader( + this.torperfLastMergedFile)); + String line; + while ((line = br.readLine()) != null) { + String[] parts = line.split(" "); + String fileName = null, timestamp = null; + if (parts.length == 2) { + try { + Double.parseDouble(parts[1]); + fileName = parts[0]; + timestamp = parts[1]; + } catch (NumberFormatException e) { + /* Handle below. */ + } + } + if (fileName == null || timestamp == null) { + this.logger.log(Level.WARNING, "Invalid line '" + line + "' in " + + this.torperfLastMergedFile.getAbsolutePath() + ". " + + "Ignoring past history of merging .data and .extradata " + + "files."); + this.lastMergedTimestamps.clear(); + break; + } + this.lastMergedTimestamps.put(fileName, timestamp); } + br.close(); + } catch (IOException e) { + this.logger.log(Level.WARNING, "Error while reading '" + + this.torperfLastMergedFile.getAbsolutePath() + ". Ignoring " + + "past history of merging .data and .extradata files."); + this.lastMergedTimestamps.clear(); + } + } + + private void writeLastMergedTimestamps() { + try { + BufferedWriter bw = new BufferedWriter(new FileWriter( + this.torperfLastMergedFile)); + for (Map.Entry<String, String> e : + this.lastMergedTimestamps.entrySet()) { + String fileName = e.getKey(); + String timestamp = e.getValue(); + bw.write(fileName + " " + timestamp + "\n"); + } + bw.close(); + } catch (IOException e) { + this.logger.log(Level.WARNING, "Error while writing '" + + this.torperfLastMergedFile.getAbsolutePath() + ". This may " + + "result in ignoring history of merging .data and .extradata " + + "files in the next execution.", e); + } + } + + private void downloadAndMergeFiles(String torperfFilesLine) { + String[] parts = torperfFilesLine.split(" "); + String sourceName = parts[1]; + int fileSize = -1; + try { + fileSize = Integer.parseInt(parts[2]); + } catch (NumberFormatException e) { + this.logger.log(Level.WARNING, "Could not parse file size in " + + "TorperfFiles configuration line '" + torperfFilesLine + + "'."); + return; + } + + /* Download and append the .data file. */ + String dataFileName = parts[3]; + String sourceBaseUrl = torperfSources.get(sourceName); + String dataUrl = sourceBaseUrl + dataFileName; + String dataOutputFileName = sourceName + "-" + dataFileName; + File dataOutputFile = new File(torperfOutputDirectory, + dataOutputFileName); + boolean downloadedDataFile = this.downloadAndAppendFile(dataUrl, + dataOutputFile, true); + + /* Download and append the .extradata file. */ + String extradataFileName = parts[4]; + String extradataUrl = sourceBaseUrl + extradataFileName; + String extradataOutputFileName = sourceName + "-" + extradataFileName; + File extradataOutputFile = new File(torperfOutputDirectory, + extradataOutputFileName); + boolean downloadedExtradataFile = this.downloadAndAppendFile( + extradataUrl, extradataOutputFile, false); + + /* Merge both files into .tpf format. */ + if (!downloadedDataFile && !downloadedExtradataFile) { + return; + } + String skipUntil = null; + if (this.lastMergedTimestamps.containsKey(dataOutputFileName)) { + skipUntil = this.lastMergedTimestamps.get(dataOutputFileName); + } + try { + skipUntil = this.mergeFiles(dataOutputFile, extradataOutputFile, + sourceName, fileSize, skipUntil); + } catch (IOException e) { + this.logger.log(Level.WARNING, "Failed merging " + dataOutputFile + + " and " + extradataOutputFile + ".", e); + } + if (skipUntil != null) { + this.lastMergedTimestamps.put(dataOutputFileName, skipUntil); } } - private void downloadAndMergeFile(String url, File outputFile, + private boolean downloadAndAppendFile(String url, File outputFile, boolean isDataFile) { + + /* Read an existing output file to determine which line will be the + * first to append to it. */ String lastTimestampLine = null; int linesAfterLastTimestampLine = 0; if (outputFile.exists() && outputFile.lastModified() > System.currentTimeMillis() - 330L * 60L * 1000L) { - return; + return false; } else if (outputFile.exists()) { try { BufferedReader br = new BufferedReader(new FileReader( @@ -85,10 +192,10 @@ public class TorperfDownloader { } br.close(); } catch (IOException e) { - logger.log(Level.WARNING, "Failed reading '" - + outputFile.getAbsolutePath() + "' to find the last line to " - + "append to.", e); - return; + this.logger.log(Level.WARNING, "Failed reading '" + + outputFile.getAbsolutePath() + "' to determine the first " + + "line to append to it.", e); + return false; } } try { @@ -120,14 +227,14 @@ public class TorperfDownloader { bw.close(); br.close(); } catch (IOException e) { - logger.log(Level.WARNING, "Failed downloading and merging '" + url - + "'.", e); - return; + this.logger.log(Level.WARNING, "Failed downloading and/or merging '" + + url + "'.", e); + return false; } if (lastTimestampLine == null) { - logger.warning("'" + outputFile.getAbsolutePath() + "' doesn't " - + "contain any timestamp lines. Unable to check whether that " - + "file is stale or not."); + this.logger.warning("'" + outputFile.getAbsolutePath() + + "' doesn't contain any timestamp lines. Unable to check " + + "whether that file is stale or not."); } else { long lastTimestampMillis = -1L; if (isDataFile) { @@ -141,11 +248,318 @@ public class TorperfDownloader { } if (lastTimestampMillis < System.currentTimeMillis() - 330L * 60L * 1000L) { - logger.warning("The last timestamp in '" + this.logger.warning("The last timestamp in '" + outputFile.getAbsolutePath() + "' is more than 5:30 hours " + "old: " + lastTimestampMillis); } } + return true; + } + + private String mergeFiles(File dataFile, File extradataFile, + String source, int fileSize, String skipUntil) throws IOException { + SortedMap<String, String> config = new TreeMap<String, String>(); + config.put("SOURCE", source); + config.put("FILESIZE", String.valueOf(fileSize)); + if (!dataFile.exists() || !extradataFile.exists()) { + this.logger.warning("File " + dataFile.getAbsolutePath() + " or " + + extradataFile.getAbsolutePath() + " is missing."); + return null; + } + this.logger.fine("Merging " + dataFile.getAbsolutePath() + " and " + + extradataFile.getAbsolutePath() + " into .tpf format."); + BufferedReader brD = new BufferedReader(new FileReader(dataFile)), + brE = new BufferedReader(new FileReader(extradataFile)); + String lineD = brD.readLine(), lineE = brE.readLine(); + int d = 1, e = 1; + String maxDataComplete = null, maxUsedAt = null; + while (lineD != null) { + + /* Parse .data line. Every valid .data line will go into the .tpf + * format, either with additional information from the .extradata + * file or without it. */ + if (lineD.isEmpty()) { + this.logger.finer("Skipping empty line " + dataFile.getName() + ":" + + d++ + "."); + lineD = brD.readLine(); + continue; + } + SortedMap<String, String> data = this.parseDataLine(lineD); + if (data == null) { + this.logger.warning("Skipping illegal line .data:" + d++ + " '" + + lineD + "'."); + lineD = brD.readLine(); + continue; + } + String dataComplete = data.get("DATACOMPLETE"); + double dataCompleteSeconds = Double.parseDouble(dataComplete); + if (skipUntil != null && dataComplete.compareTo(skipUntil) < 0) { + this.logger.finer("Skipping " + dataFile.getName() + ":" + + d++ + " which we already processed before."); + lineD = brD.readLine(); + continue; + } + maxDataComplete = dataComplete; + + /* Parse .extradata line if available and try to find the one that + * matches the .data line. */ + SortedMap<String, String> extradata = null; + while (lineE != null) { + if (lineE.isEmpty()) { + this.logger.finer("Skipping " + extradataFile.getName() + ":" + + e++ + " which is empty."); + lineE = brE.readLine(); + continue; + } + if (lineE.startsWith("BUILDTIMEOUT_SET ")) { + this.logger.finer("Skipping " + extradataFile.getName() + ":" + + e++ + " which is a BUILDTIMEOUT_SET line."); + lineE = brE.readLine(); + continue; + } else if (lineE.startsWith("ok ") || + lineE.startsWith("error ")) { + this.logger.finer("Skipping " + extradataFile.getName() + ":" + + e++ + " which is in the old format."); + lineE = brE.readLine(); + continue; + } + extradata = this.parseExtradataLine(lineE); + if (extradata == null) { + this.logger.warning("Skipping Illegal line .extradata:" + e++ + + " '" + lineE + "'."); + lineE = brE.readLine(); + continue; + } + if (!extradata.containsKey("USED_AT")) { + this.logger.finer("Skipping " + extradataFile.getName() + ":" + + e++ + " which doesn't contain a USED_AT element."); + lineE = brE.readLine(); + continue; + } + String usedAt = extradata.get("USED_AT"); + double usedAtSeconds = Double.parseDouble(usedAt); + if (skipUntil != null && usedAt.compareTo(skipUntil) < 0) { + this.logger.finer("Skipping " + extradataFile.getName() + ":" + + e++ + " which we already processed before."); + lineE = brE.readLine(); + continue; + } + maxUsedAt = usedAt; + if (Math.abs(usedAtSeconds - dataCompleteSeconds) <= 1.0) { + this.logger.fine("Merging " + extradataFile.getName() + ":" + + e++ + " into the current .data line."); + lineE = brE.readLine(); + break; + } else if (usedAtSeconds > dataCompleteSeconds) { + this.logger.finer("Comparing " + extradataFile.getName() + + " to the next .data line."); + extradata = null; + break; + } else { + this.logger.finer("Skipping " + extradataFile.getName() + ":" + + e++ + " which is too old to be merged with .data:" + d + + "."); + lineE = brE.readLine(); + continue; + } + } + + /* Write output line to .tpf file. */ + SortedMap<String, String> keysAndValues = + new TreeMap<String, String>(); + if (extradata != null) { + keysAndValues.putAll(extradata); + } + keysAndValues.putAll(data); + keysAndValues.putAll(config); + this.logger.fine("Writing " + dataFile.getName() + ":" + d++ + "."); + lineD = brD.readLine(); + try { + this.writeTpfLine(source, fileSize, keysAndValues); + } catch (IOException ex) { + this.logger.log(Level.WARNING, "Error writing output line. " + + "Aborting to merge " + dataFile.getName() + " and " + + extradataFile.getName() + ".", e); + break; + } + } + brD.close(); + brE.close(); + this.writeCachedTpfLines(); + if (maxDataComplete == null) { + return maxUsedAt; + } else if (maxUsedAt == null) { + return maxDataComplete; + } else if (maxDataComplete.compareTo(maxUsedAt) > 0) { + return maxUsedAt; + } else { + return maxDataComplete; + } + } + + private SortedMap<Integer, String> dataTimestamps; + private SortedMap<String, String> parseDataLine(String line) { + String[] parts = line.trim().split(" "); + if (line.length() == 0 || parts.length < 20) { + return null; + } + if (this.dataTimestamps == null) { + this.dataTimestamps = new TreeMap<Integer, String>(); + this.dataTimestamps.put(0, "START"); + this.dataTimestamps.put(2, "SOCKET"); + this.dataTimestamps.put(4, "CONNECT"); + this.dataTimestamps.put(6, "NEGOTIATE"); + this.dataTimestamps.put(8, "REQUEST"); + this.dataTimestamps.put(10, "RESPONSE"); + this.dataTimestamps.put(12, "DATAREQUEST"); + this.dataTimestamps.put(14, "DATARESPONSE"); + this.dataTimestamps.put(16, "DATACOMPLETE"); + this.dataTimestamps.put(21, "DATAPERC10"); + this.dataTimestamps.put(23, "DATAPERC20"); + this.dataTimestamps.put(25, "DATAPERC30"); + this.dataTimestamps.put(27, "DATAPERC40"); + this.dataTimestamps.put(29, "DATAPERC50"); + this.dataTimestamps.put(31, "DATAPERC60"); + this.dataTimestamps.put(33, "DATAPERC70"); + this.dataTimestamps.put(35, "DATAPERC80"); + this.dataTimestamps.put(37, "DATAPERC90"); + } + SortedMap<String, String> data = new TreeMap<String, String>(); + try { + for (Map.Entry<Integer, String> e : this.dataTimestamps.entrySet()) { + int i = e.getKey(); + if (parts.length > i + 1) { + String key = e.getValue(); + String value = String.format("%s.%02d", parts[i], + Integer.parseInt(parts[i + 1]) / 10000); + data.put(key, value); + } + } + } catch (NumberFormatException e) { + return null; + } + data.put("WRITEBYTES", parts[18]); + data.put("READBYTES", parts[19]); + if (parts.length >= 21) { + data.put("DIDTIMEOUT", parts[20]); + } + return data; + } + + private SortedMap<String, String> parseExtradataLine(String line) { + String[] parts = line.split(" "); + SortedMap<String, String> extradata = new TreeMap<String, String>(); + String previousKey = null; + for (String part : parts) { + String[] keyAndValue = part.split("=", -1); + if (keyAndValue.length == 2) { + String key = keyAndValue[0]; + previousKey = key; + String value = keyAndValue[1]; + if (value.contains(".") && value.lastIndexOf(".") == + value.length() - 2) { + /* Make sure that all floats have two trailing digits. */ + value += "0"; + } + extradata.put(key, value); + } else if (keyAndValue.length == 1 && previousKey != null) { + String value = keyAndValue[0]; + if (previousKey.equals("STREAM_FAIL_REASONS") && + (value.equals("MISC") || value.equals("EXITPOLICY") || + value.equals("RESOURCELIMIT") || + value.equals("RESOLVEFAILED"))) { + extradata.put(previousKey, extradata.get(previousKey) + ":" + + value); + } else { + return null; + } + } else { + return null; + } + } + return extradata; + } + + private String cachedSource; + private int cachedFileSize; + private String cachedStartDate; + private SortedMap<String, String> cachedTpfLines; + private void writeTpfLine(String source, int fileSize, + SortedMap<String, String> keysAndValues) throws IOException { + StringBuilder sb = new StringBuilder(); + int written = 0; + for (Map.Entry<String, String> keyAndValue : + keysAndValues.entrySet()) { + String key = keyAndValue.getKey(); + String value = keyAndValue.getValue(); + sb.append((written++ > 0 ? " " : "") + key + "=" + value); + } + String line = sb.toString(); + String startString = keysAndValues.get("START"); + long startMillis = Long.parseLong(startString.substring(0, + startString.indexOf("."))) * 1000L; + String startDate = dateFormat.format(startMillis); + if (this.cachedTpfLines == null || !source.equals(this.cachedSource) || + fileSize != this.cachedFileSize || + !startDate.equals(this.cachedStartDate)) { + this.writeCachedTpfLines(); + this.readTpfLinesToCache(source, fileSize, startDate); + } + if (!this.cachedTpfLines.containsKey(startString) || + line.length() > this.cachedTpfLines.get(startString).length()) { + this.cachedTpfLines.put(startString, line); + } + } + + private void readTpfLinesToCache(String source, int fileSize, + String startDate) throws IOException { + this.cachedTpfLines = new TreeMap<String, String>(); + this.cachedSource = source; + this.cachedFileSize = fileSize; + this.cachedStartDate = startDate; + File tpfFile = new File(torperfOutputDirectory, + startDate.replaceAll("-", "/") + "/" + + source + "-" + String.valueOf(fileSize) + "-" + startDate + + ".tpf"); + if (!tpfFile.exists()) { + return; + } + BufferedReader br = new BufferedReader(new FileReader(tpfFile)); + String line; + while ((line = br.readLine()) != null) { + if (line.startsWith("@type ")) { + continue; + } + if (line.contains("START=")) { + String startString = line.substring(line.indexOf("START=") + + "START=".length()).split(" ")[0]; + this.cachedTpfLines.put(startString, line); + } + } + br.close(); + } + + private void writeCachedTpfLines() throws IOException { + if (this.cachedSource == null || this.cachedFileSize == 0 || + this.cachedStartDate == null || this.cachedTpfLines == null) { + return; + } + File tpfFile = new File(torperfOutputDirectory, + this.cachedStartDate.replaceAll("-", "/") + + "/" + this.cachedSource + "-" + + String.valueOf(this.cachedFileSize) + "-" + + this.cachedStartDate + ".tpf"); + tpfFile.getParentFile().mkdirs(); + BufferedWriter bw = new BufferedWriter(new FileWriter(tpfFile)); + bw.write("@type torperf 1.0\n"); + for (String line : this.cachedTpfLines.values()) { + bw.write(line + "\n"); + } + bw.close(); + this.cachedSource = null; + this.cachedFileSize = 0; + this.cachedStartDate = null; + this.cachedTpfLines = null; } }

1 0

[metrics-db/master] Print out a warning if we're missing Torperf data lines.
by karsten＠torproject.org 29 May '12

29 May '12

commit a77d67de24ab52655479c94a243633f4d4245cdb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 29 20:14:51 2012 +0200 Print out a warning if we're missing Torperf data lines. --- src/org/torproject/ernie/db/TorperfDownloader.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/TorperfDownloader.java b/src/org/torproject/ernie/db/TorperfDownloader.java index e7c55a1..ddd202a 100644 --- a/src/org/torproject/ernie/db/TorperfDownloader.java +++ b/src/org/torproject/ernie/db/TorperfDownloader.java @@ -226,6 +226,13 @@ public class TorperfDownloader { } bw.close(); br.close(); + if (!copyLines) { + this.logger.warning("The last timestamp line in '" + + outputFile.getAbsolutePath() + "' is not contained in the " + + "new file downloaded from '" + url + "'. Cannot append " + + "new lines without possibly leaving a gap. Skipping."); + return false; + } } catch (IOException e) { this.logger.log(Level.WARNING, "Failed downloading and/or merging '" + url + "'.", e);

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 May '12

29 May '12

commit f56f83083a27df106b1aaef02cbcafab31a726de Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 29 11:45:06 2012 +0000 Update translations for tsum --- ru/short-user-manual_ru_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/short-user-manual_ru_noimg.xhtml b/ru/short-user-manual_ru_noimg.xhtml index 491f21d..1b3abf1 100644 --- a/ru/short-user-manual_ru_noimg.xhtml +++ b/ru/short-user-manual_ru_noimg.xhtml @@ -23,8 +23,8 @@ <h3 id="tor-for-smartphones">Tor для смартфонов</h3> <p>Вы можете настроить Tor на своём Android-устройстве, установив пакет, который называется <em>Orbot</em>. Справка по его загрузке и установке есть на <a href="https://www.torproject.org/docs/android.html.en">Сайте Проекта Tor</a>.</p> <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p> - <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3> - <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p> + <h3 id="how-to-verify-that-you-have-the-right-version">Как проверить, та ли у Вас версия</h3> + <p>Прежде, чем запускать Пакет Tor-Браузера, следует удостовериться в том, что у Вас находится правильная его версия.</p> <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p> <p>Before you can verify the signature, you will have to download and install GnuPG:</p> <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br /><strong>Mac OS X</strong>: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a><br /><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 May '12

29 May '12

commit 0aad0315cdd571c6a827af97f0c8f39f16f41cd1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 29 11:15:07 2012 +0000 Update translations for tsum --- ru/short-user-manual_ru_noimg.xhtml | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ru/short-user-manual_ru_noimg.xhtml b/ru/short-user-manual_ru_noimg.xhtml index 9a8817f..491f21d 100644 --- a/ru/short-user-manual_ru_noimg.xhtml +++ b/ru/short-user-manual_ru_noimg.xhtml @@ -5,23 +5,23 @@ </head> <body> <h1 id="the-short-user-manual">Краткое Руководство Пользователя</h1> - <p>Это пользовательское руководство расскажет о том, как загрузить Tor, как им пользоваться, и что предпринимать в случаях, когда Tor не может соединиться с сетью. Если у Вас не получилось найти в этом документе ответ на свой вопрос, не стесняйтесь написать нам по адресу help(a)rt.torproject.org.</p> + <p>Это пользовательское руководство расскажет о том, как скачать Tor, как им пользоваться, и что предпринимать в случаях, когда Tor не может соединиться с сетью. Если у Вас не получилось найти в этом документе ответ на свой вопрос, не стесняйтесь написать нам по адресу help(a)rt.torproject.org.</p> <p>Пожалуйста, помните, что мы осуществляем техподдержку на добровольных началах, причём каждый Божий день нам приходит куча писем с вопросами. Поэтому не волнуйтесь, если мы медлим с ответом на Ваше письмо.</p> <h2 id="how-tor-works">Как работает Tor</h2> <p>Tor - это сеть виртуальных туннелей, которая позволяет Вам лучше защищать неприкосновенность Вашей частной жизни и свою безопасность в Интернете. Работает это вот как: Tor соединяет Ваш компьютер с Интернетом не напрямую, а через цепочку из трёх выбранных наугад компьютеров (т.н. <em>ретрансляторы</em>) которые принадлежат к сети Tor.</p> <p>На рисунке выше изображено, что происходит, когда пользователь посещает различные веб-сайты через Tor. Зелёные мониторы - это ретрансляторы сети Tor, а три ключика - это последовательные слои шифрования между пользователем и каждым следующим ретранслятором.</p> <p>Всё, что вы посылаете в Интернет через Tor, становится, во-первых анонимным (скрывается источник), а во-вторых, остаётся зашифрованным на всём пути между Вашим компьютером и последним ретранслятором. Но после того, как данные покидают последний ретранслятор и отправляются к интернет-адресу своего назначения - они идут уже не в зашифрованном, а обычном, открытом виде.</p> <p>Если вы передаёте особо важные данные - например, вводите логин и пароль для входа на веб-сайт - убедитесь, что работает протокол HTTPS (т.е. в адресной строке написано, например, <strong>https</strong>://torproject.org/, а не <strong>http</strong>://torproject.org/).</p> - <h2 id="how-to-download-tor">Как загрузить Tor</h2> - <p>Пакет программ, который мы обычно рекомендуем - это <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. Этот пакет не требует установки и содержит браузер, заранее настроенный таким образом, чтобы безопасно выходить в интернет через Tor. Вы просто загружаете пакет, распаковываете архив и запускаете Tor.</p> - <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p> - <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3> - <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p> - <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p> - <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p> - <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p> - <h3 id="tor-for-smartphones">Tor for smartphones</h3> - <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p> + <h2 id="how-to-download-tor">Как скачать Tor</h2> + <p>Пакет программ, который мы обычно рекомендуем - это <a href="https://www.torproject.org/projects/torbrowser.html">Пакет Tor-Браузера</a>. Этот пакет не требует установки и содержит браузер, заранее настроенный таким образом, чтобы безопасно выходить в интернет через Tor. Вы просто загружаете пакет, распаковываете архив и запускаете Tor.</p> + <p>Есть два разных способа заполучить программное обеспечение Tor. Вы можете либо открыть в браузере <a href="https://www.torproject.org/">Сайт Проекта Tor</a> и скачать программу оттуда, либо вы можете воспользоваться GetTor - нашим автоответчиком электронной почты.</p> + <h3 id="how-to-get-tor-via-email">Как получить Tor по электронной почте</h3> + <p>Чтобы получить Английский Пакет Tor-Браузера для Windows, отправьте письмо на адрес электронной почты gettor(a)torproject.org со словом <strong>windows</strong> в теле сообщения. Поле "Тема" можете оставить пустым.</p> + <p>Подобным же образом Вы можете запросить Пакет Tor-Браузера для Mac OS (написав <strong>macos-i386</strong>), и для Linux (написав <strong>linux-i386</strong> для 32-битных систем или <strong>linux-x86_64</strong> для 64-битных систем)</p> + <p>Если Вам нужна переведённая версия Tor, напишите в письме <strong>help</strong>. Вам придёт ответное письмо с инструкциями и списком доступных языков.</p> + <p><strong>Заметка</strong>: Пакет Tor-Браузера для Linux и Mac OS X имеют значительный размер, так что Вы не сможете получить эти пакеты по электронной почте через Gmail, Hotmail или Yahoo. Если у Вас не выходит заполучить необходимый Вам пакет, напишите письмо на адрес help(a)rt.torproject.org и мы дадим Вам список сайтов-зеркал для скачивания этого пакета.</p> + <h3 id="tor-for-smartphones">Tor для смартфонов</h3> + <p>Вы можете настроить Tor на своём Android-устройстве, установив пакет, который называется <em>Orbot</em>. Справка по его загрузке и установке есть на <a href="https://www.torproject.org/docs/android.html.en">Сайте Проекта Tor</a>.</p> <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p> <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3> <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>

1 0