[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1559: Tag the 0.0.10 release. (in releases: . vidalia-0.0.10 vidalia-0.0.10/pkg vidalia-0.0.10/pkg/win32 vidalia-0.0.10/src)
Author: edmanm
Date: 2006-12-25 21:02:23 -0500 (Mon, 25 Dec 2006)
New Revision: 1559
Added:
releases/vidalia-0.0.10/
releases/vidalia-0.0.10/AUTHORS
releases/vidalia-0.0.10/CHANGELOG
releases/vidalia-0.0.10/pkg/build-geoip-cache.sh
releases/vidalia-0.0.10/pkg/geoip-cache
releases/vidalia-0.0.10/pkg/win32/build-bundle.txt
releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi
releases/vidalia-0.0.10/pkg/win32/vidalia.nsi
releases/vidalia-0.0.10/src/
Removed:
releases/vidalia-0.0.10/AUTHORS
releases/vidalia-0.0.10/CHANGELOG
releases/vidalia-0.0.10/pkg/win32/build-bundle.txt
releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi
releases/vidalia-0.0.10/pkg/win32/vidalia.nsi
releases/vidalia-0.0.10/src/
Modified:
releases/vidalia-0.0.10/configure.in
releases/vidalia-0.0.10/src/vidalia.h
Log:
Tag the 0.0.10 release.
Copied: releases/vidalia-0.0.10 (from rev 1539, trunk)
Deleted: releases/vidalia-0.0.10/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-12-17 04:13:16 UTC (rev 1539)
+++ releases/vidalia-0.0.10/AUTHORS 2006-12-26 02:02:23 UTC (rev 1559)
@@ -1,55 +0,0 @@
-Vidalia is developed by:
- Matt Edman <edmanm@xxxxxxxxxxxxxxxxxxx>
- Justin Hipple <hipplej@xxxxxxxxxxxxxxxxxxx>
-
-Contributors:
- Corinna Habets <corinna@xxxxxxxxx> created the images off which
- our application icons are based.
-
- Ren Bucholz <http://homes.eff.org/~renbucholz/tor/> created some of the
- onion images off of which Corinna's icons and some of our own images are
- based.
-
- The Tango Desktop Project <http://tango-project.org> created many of the
- icons used in Vidalia. See LICENSE for details.
-
- Brandon Nase <http://www.students.dsu.edu/naseb/> designed and built
- the Vidalia-Project website.
-
- Matt Hanson <http://www.zuerchertech.com/> tweaked Corinna's images a bit
- and created some .icos based off of them.
-
- Dan Christensen <http://opello.org/> added additional image formats to
- the .ico files to support more Windowses. He also created the graph style
- icons in the bandwidth graph settings.
-
- Geoff Goodell <http://afs.eecs.harvard.edu/~goodell/> supplied us with
- nearly all of the flag icons that we use in the Appearance configuration
- page. He also created the router status icons we use in the network view
- dialog.
-
- Michael Zuercher and Adam Tomjack of Zuerchertech LLC
- <http://www.zuerchertech.com> gave us the ZImageView class which handles
- drawing, scrolling and zooming the map image in the Network Viewer.
-
- Christoph Sieghart (sigi) <http://www.0x2a.at/blog/> gave us some code that
- converts world space coordinates (latitude,longitude) into image space
- coordinates (x,y) which we used in the Net Viewer.
-
-Translators:
- Bulgarian kutia0001
- Dutch Saedian
- Finnish DJ Hasis
- French Michel Burkhardt
- eight118
- German Christoph Sieghart
- Steffen Dabbert
- Hungarian Tibor Fekete
- Italian Alex Mazzariol
- Norwegian xiando
- Polish ZeeWolf
- Portuguese Mabat Haram
- Russian ygrek
- Spanish desolator
- Simplified Chinese Wu Xiaoguang
-
Copied: releases/vidalia-0.0.10/AUTHORS (from rev 1547, trunk/AUTHORS)
===================================================================
--- releases/vidalia-0.0.10/AUTHORS (rev 0)
+++ releases/vidalia-0.0.10/AUTHORS 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,55 @@
+Vidalia is developed by:
+ Matt Edman <edmanm@xxxxxxxxxxxxxxxxxxx>
+ Justin Hipple <hipplej@xxxxxxxxxxxxxxxxxxx>
+
+Contributors:
+ Corinna Habets <corinna@xxxxxxxxx> created the images off which
+ our application icons are based.
+
+ Ren Bucholz <http://homes.eff.org/~renbucholz/tor/> created some of the
+ onion images off of which Corinna's icons and some of our own images are
+ based.
+
+ The Tango Desktop Project <http://tango-project.org> created many of the
+ icons used in Vidalia. See LICENSE for details.
+
+ Brandon Nase <http://www.students.dsu.edu/naseb/> designed and built
+ the Vidalia-Project website.
+
+ Matt Hanson <http://www.zuerchertech.com/> tweaked Corinna's images a bit
+ and created some .icos based off of them.
+
+ Dan Christensen <http://opello.org/> added additional image formats to
+ the .ico files to support more Windowses. He also created the graph style
+ icons in the bandwidth graph settings.
+
+ Geoff Goodell <http://afs.eecs.harvard.edu/~goodell/> supplied us with
+ nearly all of the flag icons that we use in the Appearance configuration
+ page and network map. He also created the router status icons we use in
+ the network map.
+
+ Michael Zuercher and Adam Tomjack of Zuerchertech LLC
+ <http://www.zuerchertech.com> gave us the ZImageView class which handles
+ drawing, scrolling and zooming the map image in the Network Viewer.
+
+ Christoph Sieghart (sigi) <http://www.0x2a.at/blog/> gave us some code that
+ converts world space coordinates (latitude,longitude) into image space
+ coordinates (x,y) which we used in the Net Viewer.
+
+Translators:
+ Bulgarian kutia0001
+ Dutch Saedian
+ Finnish DJ Hasis
+ French Michel Burkhardt
+ eight118
+ German Christoph Sieghart
+ Steffen Dabbert
+ Hungarian Tibor Fekete
+ Italian Alex Mazzariol
+ Norwegian xiando
+ Polish ZeeWolf
+ Portuguese Mabat Haram
+ Russian ygrek
+ Spanish desolator
+ Simplified Chinese Wu Xiaoguang
+
Deleted: releases/vidalia-0.0.10/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2006-12-17 04:13:16 UTC (rev 1539)
+++ releases/vidalia-0.0.10/CHANGELOG 2006-12-26 02:02:23 UTC (rev 1559)
@@ -1,215 +0,0 @@
-0.0.10 ??-Dec-2006
- o Load NT service functions on demand so we can run on Windows 95/98/ME
- again. (Ticket #211)
- 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 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 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.
- If we're still using an old Qt, make sure the window fits on screen when
- we try to restore it. (Ticket #207)
- o Really close the read channel when we want to stop reading from the Tor
- process's stdout. This would sometimes cause duplicate messages in the
- message log if Vidalia was running on a non-English-speaking Windows.
- o Give a better error message if we fail to determine what version of Tor's
- control protocol is being spoken.
- o Clarify some labels in the message log settings. (Ticket #203)
- o Settle on a convention of not ending tool tips or status tips with a
- period.
- o Add a Farsi translation.
- 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, Polish, and Russian translations.
-
-
-0.0.9 05-Nov-2006
- o Added a new, more intuitive interface for setting a server's bandwidth
- rate and exit policies.
- 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
- close the circuit (Ticket #176).
- 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
- log (Ticket #185).
- o Fixed a bug that would cause messages with identical timestamps to not
- get copied to the clipboard (Ticket #190).
- o Ask if the user wants to delay shutting down their server when Vidalia
- exits, to give clients time to find new circuits. We previously only did
- this when the user stopped Tor, but wasn't exiting Vidalia.
- o If Windows is restarting, then don't ask about delaying a server shut
- 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
- 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
- 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
- descriptors.
- o Ask Tor what its SocksPort and SocksAddress is before building our GeoIP
- request, instead of always assuming Tor is listening on 127.0.0.1:9050.
- o Explicitly specify the sort order for the message log and server list, so
- things aren't backwards when linking with Qt 4.2.x.
- o Add support for translating the Vidalia and Vidalia bundle installers.
- o Start bundling Torbutton with the Vidalia bundle installer.
- o Add a Norwegian (Bokmal) translation contributed by xiando.
- o Updates to the Finnish, French, German, and Polish translations.
-
-
-0.0.8 03-Oct-2006
- o Vidalia will now attempt to connect to an existing Tor's ControlPort
- before starting its own Tor process. If it finds a Tor with an open
- 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
- 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
- applications.
- 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
- 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
- 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
- circuits.
- o Numerous minor aesthetic and usability improvements to many of Vidalia's
- dialogs.
- o Fix a bug that was causing signal conflict warnings on Debian.
- o Fix a crash that would occur when exiting Vidalia after an attempt to
- start Tor with a non-existent executable.
- o Add a Bulgarian translation contributed by kutia0001.
- o Add a Dutch translation contributed by Saedian.
- o Add a Hungarian translation contributed by Tibor Fekete.
- o Add a Polish translation contributed by ZeeWolf.
- o Updates to the Finnish, French, and Russian translations.
-
-
-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
- uptime.
-
-
-0.0.6 23-Jun-2006
- o Fix the network map to properly remove circuits after they are closed.
- o Fix our configure script to properly handle the --prefix option (patch by
- Alexander Wirt).
- o Check if Vidalia is already running when we start. If Vidalia is already
- running, then warn and exit in the second instance.
- o Strip all invalid characters from the server's nickname and make sure the
- user can't enter any.
- o Default to the Tor binary located in the user's $PATH, instead of trying
- to guess directory locations.
- o Add support for adjusting a server's BandwidthRate and BandwidthBurst
- values.
- o Store Vidalia's settings in a file, (rather than in the registry on
- Windows), so Vidalia can be more portable. Note that settings aren't
- "imported" from the registry, so 0.0.5 users will have to configure
- their Vidalia settings again.
- o Make the bandwidth graph just a normal window instead of a tool window, so
- it can hide behind other Vidalia windows, if necessary.
- o On OS X, ensure that the About, Configure, and Exit actions get merged
- into the "Vidalia" menu in the default menubar when Vidalia is running in
- a non-English language.
- 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
- knows about, as well as the user's current circuits and streams and
- detailed information about individual routers. The circuits and router
- geographic locations are plotted on a world map. Thanks to Christoph
- Sieghart, Michael Zuercher, and Adam Tomjack for help with this feature.
- o Stop automatically scrolling to the newest item added to the message log,
- if the user is looking through their message history.
- o Create a horizontal scrollbar on the message log when an excessively long
- message is logged.
- o Add support for the NEWNYM signal in the form of a "New Identity"
- button, to force Tor to use only clean circuits for new application
- requests.
- o Add a Mac OS X bundle.
- o Add a Finnish translation contributed by DJHasis.
- o Add a German translation contributed by Christoph Sieghart.
- o Fix a bug that caused people running servers to update their public IP
- address too often if they had the "Automatically Update" option checked.
-
-
-0.0.4 09-May-2006
- o Add a fixed set of Windows .ico files from Dan Christensen. Our
- contributed set in 0.0.3 apparently had a blank image in it that some old
- Windowses would use instead of the icon that actually had an image.
- o Add an option for servers to check periodically to see if their public IP
- address has changed.
- o Give servers the option to shut down after 30 seconds, to give clients
- time to find new circuits, instead of just always killing Tor immediately.
- o Improve GUI responsiveness when waiting for the Tor process to finish
- starting up.
- 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
- 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
- because the system is restarting.
- o Improved tray icon support on older Windowses. Also started using a new
- set of icons created by Matt Hanson, based on our previous set by Corinna
- Habets.
- 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.
- o Added support for language translations and language selection.
- o Added a Simplified Chinese (zh_CN) translation from Wu Xiaoguong.
- 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:
- - Starting/stopping/monitoring Tor
- - Bandwidth graph
- - Message log
- - Basic server configuration
-
Copied: releases/vidalia-0.0.10/CHANGELOG (from rev 1557, trunk/CHANGELOG)
===================================================================
--- releases/vidalia-0.0.10/CHANGELOG (rev 0)
+++ releases/vidalia-0.0.10/CHANGELOG 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,236 @@
+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 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
+ 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
+ graph.
+ o Add a button to continue starting Vidalia anyway, even if Vidalia thinks
+ there might be another Vidalia process already running. It's possible that a
+ previous Vidalia did not exit cleanly and another process ended up with
+ the old Vidalia's PID.
+ 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.
+ 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
+ could cause some circuits to not get drawn. (Ticket #175)
+ o Really close the read channel when we want to stop reading from the Tor
+ process's stdout. This would sometimes cause duplicate messages in the
+ message log if Vidalia was running on a non-English-speaking Windows.
+ o Be more correct about what we consider as valid latitudes and longitudes.
+ o Give a better error message if we fail to determine what version of Tor's
+ control protocol is being spoken.
+ o Clarify some labels in the message log settings. (Ticket #203)
+ o Settle on a convention of not ending tool tips or status tips with a
+ period.
+ o Start shipping a geoip-cache file in our Win32 installers so people have
+ some initial geographic information, instead of starting out entirely
+ empty-handed.
+ o Add a Farsi translation.
+ 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,
+ Russian, and Simplified Chinese translations.
+
+
+0.0.9 05-Nov-2006
+ o Added a new, more intuitive interface for setting a server's bandwidth
+ rate and exit policies.
+ 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
+ close the circuit (Ticket #176).
+ 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
+ log (Ticket #185).
+ o Fixed a bug that would cause messages with identical timestamps to not
+ get copied to the clipboard (Ticket #190).
+ o Ask if the user wants to delay shutting down their server when Vidalia
+ exits, to give clients time to find new circuits. We previously only did
+ this when the user stopped Tor, but wasn't exiting Vidalia.
+ o If Windows is restarting, then don't ask about delaying a server shut
+ 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
+ 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
+ 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
+ descriptors.
+ o Ask Tor what its SocksPort and SocksAddress is before building our GeoIP
+ request, instead of always assuming Tor is listening on 127.0.0.1:9050.
+ o Explicitly specify the sort order for the message log and server list, so
+ things aren't backwards when linking with Qt 4.2.x.
+ o Add support for translating the Vidalia and Vidalia bundle installers.
+ o Start bundling Torbutton with the Vidalia bundle installer.
+ o Add a Norwegian (Bokmal) translation contributed by xiando.
+ o Updates to the Finnish, French, German, and Polish translations.
+
+
+0.0.8 03-Oct-2006
+ o Vidalia will now attempt to connect to an existing Tor's ControlPort
+ before starting its own Tor process. If it finds a Tor with an open
+ 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
+ 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
+ applications.
+ 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
+ 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
+ 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
+ circuits.
+ o Numerous minor aesthetic and usability improvements to many of Vidalia's
+ dialogs.
+ o Fix a bug that was causing signal conflict warnings on Debian.
+ o Fix a crash that would occur when exiting Vidalia after an attempt to
+ start Tor with a non-existent executable.
+ o Add a Bulgarian translation contributed by kutia0001.
+ o Add a Dutch translation contributed by Saedian.
+ o Add a Hungarian translation contributed by Tibor Fekete.
+ o Add a Polish translation contributed by ZeeWolf.
+ o Updates to the Finnish, French, and Russian translations.
+
+
+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
+ uptime.
+
+
+0.0.6 23-Jun-2006
+ o Fix the network map to properly remove circuits after they are closed.
+ o Fix our configure script to properly handle the --prefix option (patch by
+ Alexander Wirt).
+ o Check if Vidalia is already running when we start. If Vidalia is already
+ running, then warn and exit in the second instance.
+ o Strip all invalid characters from the server's nickname and make sure the
+ user can't enter any.
+ o Default to the Tor binary located in the user's $PATH, instead of trying
+ to guess directory locations.
+ o Add support for adjusting a server's BandwidthRate and BandwidthBurst
+ values.
+ o Store Vidalia's settings in a file, (rather than in the registry on
+ Windows), so Vidalia can be more portable. Note that settings aren't
+ "imported" from the registry, so 0.0.5 users will have to configure
+ their Vidalia settings again.
+ o Make the bandwidth graph just a normal window instead of a tool window, so
+ it can hide behind other Vidalia windows, if necessary.
+ o On OS X, ensure that the About, Configure, and Exit actions get merged
+ into the "Vidalia" menu in the default menubar when Vidalia is running in
+ a non-English language.
+ 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
+ knows about, as well as the user's current circuits and streams and
+ detailed information about individual routers. The circuits and router
+ geographic locations are plotted on a world map. Thanks to Christoph
+ Sieghart, Michael Zuercher, and Adam Tomjack for help with this feature.
+ o Stop automatically scrolling to the newest item added to the message log,
+ if the user is looking through their message history.
+ o Create a horizontal scrollbar on the message log when an excessively long
+ message is logged.
+ o Add support for the NEWNYM signal in the form of a "New Identity"
+ button, to force Tor to use only clean circuits for new application
+ requests.
+ o Add a Mac OS X bundle.
+ o Add a Finnish translation contributed by DJHasis.
+ o Add a German translation contributed by Christoph Sieghart.
+ o Fix a bug that caused people running servers to update their public IP
+ address too often if they had the "Automatically Update" option checked.
+
+
+0.0.4 09-May-2006
+ o Add a fixed set of Windows .ico files from Dan Christensen. Our
+ contributed set in 0.0.3 apparently had a blank image in it that some old
+ Windowses would use instead of the icon that actually had an image.
+ o Add an option for servers to check periodically to see if their public IP
+ address has changed.
+ o Give servers the option to shut down after 30 seconds, to give clients
+ time to find new circuits, instead of just always killing Tor immediately.
+ o Improve GUI responsiveness when waiting for the Tor process to finish
+ starting up.
+ 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
+ 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
+ because the system is restarting.
+ o Improved tray icon support on older Windowses. Also started using a new
+ set of icons created by Matt Hanson, based on our previous set by Corinna
+ Habets.
+ 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.
+ o Added support for language translations and language selection.
+ o Added a Simplified Chinese (zh_CN) translation from Wu Xiaoguong.
+ 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:
+ - Starting/stopping/monitoring Tor
+ - Bandwidth graph
+ - Message log
+ - Basic server configuration
+
Modified: releases/vidalia-0.0.10/configure.in
===================================================================
--- trunk/configure.in 2006-12-17 04:13:16 UTC (rev 1539)
+++ releases/vidalia-0.0.10/configure.in 2006-12-26 02:02:23 UTC (rev 1559)
@@ -1,4 +1,4 @@
-AC_INIT(vidalia,0.0.10-svn)
+AC_INIT(vidalia,0.0.10)
AC_MSG_NOTICE([Configuring AC_PACKAGE_STRING...])
AC_PROG_CXX
PROFILE="Vidalia.pro"
Copied: releases/vidalia-0.0.10/pkg/build-geoip-cache.sh (from rev 1552, trunk/pkg/build-geoip-cache.sh)
===================================================================
--- releases/vidalia-0.0.10/pkg/build-geoip-cache.sh (rev 0)
+++ releases/vidalia-0.0.10/pkg/build-geoip-cache.sh 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $Id$
+#
+# Vidalia is distributed under the following license:
+#
+# Copyright (C) 2006, Matt Edman, Justin Hipple
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#################################################################
+
+DIRURL="http://tor.noreply.org/tor/status/all";
+GEOIPURL="http://geoip.vidalia-project.net/cgi-bin/geoip";
+CACHEFILE="geoip-cache"
+timestamp=$(date -u +%s)
+
+# Fetch a list of server IP addresses
+ipaddrs=$(wget -q -O - "$DIRURL" | awk '$1 == "r" { print $7 }' | sort | uniq | tr "\n" ",")
+
+# Get GeoIP information for each IP address
+geoips=$(wget -q -O - --post-data="ip=$ipaddrs" "$GEOIPURL")
+
+# Cache the GeoIP information with timestamps
+IFS=$'\n'
+rm -f $CACHEFILE
+for geoip in $geoips; do
+ echo "$geoip:$timestamp" >> "$CACHEFILE"
+done
+
Copied: releases/vidalia-0.0.10/pkg/geoip-cache (from rev 1553, trunk/pkg/geoip-cache)
===================================================================
--- releases/vidalia-0.0.10/pkg/geoip-cache (rev 0)
+++ releases/vidalia-0.0.10/pkg/geoip-cache 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,1017 @@
+1.106.108.74,UNKNOWN:1167025926
+12.199.41.184,Yellville,AR,US,36.2525,-92.6585:1167025926
+12.240.60.174,Washington,IA,US,41.3073,-91.7443:1167025926
+121.229.5.98,Beijing,22,CN,39.9289,116.3883:1167025926
+121.6.107.86,Singapore,00,SG,1.2931,103.8558:1167025926
+124.120.236.130,Bangkok,40,TH,13.7500,100.5167:1167025926
+124.51.108.134,,,KR,37.0000,127.5000:1167025926
+125.23.49.23,Pande,16,IN,18.3833,75.2333:1167025926
+128.197.11.30,Boston,MA,US,42.3451,-71.0993:1167025926
+128.2.132.175,Pittsburgh,PA,US,40.4439,-79.9562:1167025926
+128.2.141.33,Pittsburgh,PA,US,40.4439,-79.9562:1167025926
+128.232.110.15,Cambridge,C3,GB,52.2000,0.1167:1167025926
+128.30.28.19,Cambridge,MA,US,42.3646,-71.1028:1167025926
+128.83.114.63,Austin,TX,US,30.2961,-97.7369:1167025926
+129.187.150.131,Muenchen,02,DE,48.1500,11.5833:1167025926
+130.115.80.254,Rotterdam,11,NL,51.9167,4.5000:1167025926
+130.89.160.179,Enschede,15,NL,52.2167,6.9000:1167025926
+130.89.224.42,Enschede,15,NL,52.2167,6.9000:1167025926
+131.155.141.98,Eindhoven,06,NL,51.4500,5.4667:1167025926
+131.155.71.110,Eindhoven,06,NL,51.4500,5.4667:1167025926
+131.246.89.15,Kaiserslautern,08,DE,49.4500,7.7500:1167025926
+134.102.211.19,Bremen,03,DE,53.0833,8.8000:1167025926
+134.130.57.18,Aachen,07,DE,50.7708,6.1053:1167025926
+134.2.73.233,,,DE,51.0000,9.0000:1167025926
+134.231.7.30,Washington,DC,US,38.9057,-76.9783:1167025926
+134.53.24.52,Oxford,OH,US,39.4792,-84.7130:1167025926
+134.93.142.188,Mainz,08,DE,50.0000,8.2711:1167025926
+134.93.142.48,Mainz,08,DE,50.0000,8.2711:1167025926
+136.159.127.158,Calgary,AB,CA,51.0833,-114.0833:1167025926
+136.159.128.146,Calgary,AB,CA,51.0833,-114.0833:1167025926
+137.226.13.2,Aachen,07,DE,50.7708,6.1053:1167025926
+137.226.181.149,Aachen,07,DE,50.7708,6.1053:1167025926
+138.100.13.201,Madrid,29,ES,40.4000,-3.6833:1167025926
+138.202.192.210,San Francisco,CA,US,37.7691,-122.4449:1167025926
+138.26.117.12,Birmingham,AL,US,33.5446,-86.9292:1167025926
+140.127.149.102,Taipei,03,TW,25.0392,121.5250:1167025926
+140.136.146.121,Taipei,03,TW,25.0392,121.5250:1167025926
+140.142.38.109,Seattle,WA,US,47.6606,-122.2919:1167025926
+140.247.60.64,Cambridge,MA,US,42.3800,-71.1329:1167025926
+141.152.144.10,Chesapeake,VA,US,36.7558,-76.2928:1167025926
+141.35.122.92,Jena,15,DE,50.9333,11.5833:1167025926
+141.35.14.130,Jena,15,DE,50.9333,11.5833:1167025926
+141.45.70.20,Berlin,16,DE,52.5167,13.4000:1167025926
+143.248.234.71,Taejon,19,KR,36.3214,127.4197:1167025926
+145.253.97.246,Hamburg,04,DE,53.5500,10.0000:1167025926
+145.99.253.11,Amsterdam,07,NL,52.3500,4.9167:1167025926
+148.204.7.193,Mexico,09,MX,19.4342,-99.1386:1167025926
+149.9.0.27,Washington,DC,US,38.9144,-77.0763:1167025926
+149.9.0.56,Washington,DC,US,38.9144,-77.0763:1167025926
+149.9.0.57,Washington,DC,US,38.9144,-77.0763:1167025926
+149.9.0.58,Washington,DC,US,38.9144,-77.0763:1167025926
+149.9.0.59,Washington,DC,US,38.9144,-77.0763:1167025926
+150.140.191.108,Patras,38,GR,38.2444,21.7344:1167025926
+150.189.0.254,Caracas,25,VE,10.5000,-66.9167:1167025926
+151.100.107.63,Roma,07,IT,41.9000,12.4832:1167025926
+151.201.224.162,Pittsburgh,PA,US,40.4456,-79.9794:1167025926
+151.46.23.197,Milano,09,IT,45.4667,9.2000:1167025926
+151.47.129.252,Sabbioncello,20,IT,45.3667,11.9832:1167025926
+151.52.94.119,Milano,09,IT,45.4667,9.2000:1167025926
+152.13.233.17,Greensboro,NC,US,36.0661,-79.8068:1167025926
+152.160.26.9,Port Huron,MI,US,42.9875,-82.4666:1167025926
+154.20.12.215,Vancouver,BC,CA,49.2500,-123.1333:1167025926
+160.36.137.37,Knoxville,TN,US,35.9724,-83.9595:1167025926
+163.13.112.191,Taipei,03,TW,25.0392,121.5250:1167025926
+164.77.219.81,Santiago,12,CL,-33.4500,-70.6667:1167025926
+166.111.249.39,,,CN,35.0000,105.0000:1167025926
+166.70.204.26,Salt Lake City,UT,US,40.7561,-111.8837:1167025926
+166.70.207.2,Salt Lake City,UT,US,40.7561,-111.8837:1167025926
+166.70.232.84,Draper,UT,US,40.4982,-111.8436:1167025926
+166.82.141.59,Concord,NC,US,35.3932,-80.5981:1167025926
+168.150.251.39,Davis,CA,US,38.4829,-121.6398:1167025926
+172.132.203.68,,,US,38.0000,-97.0000:1167025926
+172.141.157.131,,,US,38.0000,-97.0000:1167025926
+172.177.30.78,,,US,38.0000,-97.0000:1167025926
+172.181.106.97,,,US,38.0000,-97.0000:1167025926
+172.188.56.20,,,US,38.0000,-97.0000:1167025926
+18.152.2.242,Cambridge,MA,US,42.3646,-71.1028:1167025926
+18.243.2.53,Cambridge,MA,US,42.3646,-71.1028:1167025926
+18.244.0.114,Cambridge,MA,US,42.3646,-71.1028:1167025926
+18.244.0.188,Cambridge,MA,US,42.3646,-71.1028:1167025926
+18.246.2.33,Cambridge,MA,US,42.3646,-71.1028:1167025926
+18.78.1.92,Cambridge,MA,US,42.3646,-71.1028:1167025926
+189.132.229.242,Mexico,09,MX,19.4342,-99.1386:1167025926
+190.38.164.218,,,VE,8.0000,-66.0000:1167025926
+192.26.10.2,Washington,DC,US,38.9057,-76.9783:1167025926
+192.31.21.253,La Jolla,CA,US,32.8737,-117.2420:1167025926
+192.42.113.248,Utrecht,09,NL,52.0833,5.1333:1167025926
+192.67.63.148,Plano,TX,US,33.0260,-96.6990:1167025926
+192.83.249.30,Emeryville,CA,US,37.8342,-122.2897:1167025926
+193.110.91.7,London,P5,GB,51.5000,-0.1167:1167025926
+193.16.154.187,Gieten,01,NL,53.0167,6.7667:1167025926
+193.192.249.43,Fribourg,06,CH,46.8000,7.1500:1167025926
+193.202.88.3,Budapest,05,HU,47.5000,19.0833:1167025926
+193.219.115.200,UNKNOWN:1167025926
+193.219.28.245,Warsaw,67,PL,52.2500,21.0000:1167025926
+193.88.185.116,Copenhagen,06,DK,55.6667,12.5833:1167025926
+194.109.206.212,Amsterdam,07,NL,52.3500,4.9167:1167025926
+194.125.72.114,Dublin,07,IE,53.3331,-6.2489:1167025926
+194.171.167.147,Utrecht,09,NL,52.0833,5.1333:1167025926
+194.177.96.78,Codogno,05,IT,45.1500,9.7000:1167025926
+194.21.56.6,Vicenza,20,IT,45.5500,11.5500:1167025926
+195.134.87.20,Athens,35,GR,37.9833,23.7332:1167025926
+195.158.167.214,Hamburg,04,DE,53.5500,10.0000:1167025926
+195.189.81.121,Saint Petersburg,66,RU,59.8944,30.2642:1167025926
+195.210.38.204,Leeds,H3,GB,53.8000,-1.5833:1167025926
+195.230.168.95,Eisenstadt,01,AT,47.8500,16.5167:1167025926
+195.244.97.205,Hamburg,04,DE,53.5500,10.0000:1167025926
+195.37.132.28,Franken,08,DE,50.5000,7.2332:1167025926
+195.71.225.75,Verl,07,DE,51.8833,8.5167:1167025926
+195.71.8.10,Verl,07,DE,51.8833,8.5167:1167025926
+195.85.225.145,Zaandam,07,NL,52.4500,4.8333:1167025926
+195.90.9.250,Koeln,07,DE,50.9333,6.9500:1167025926
+195.91.136.2,Moscow,48,RU,55.7522,37.6156:1167025926
+198.145.242.242,Vancouver,WA,US,45.6023,-122.5167:1167025926
+199.107.161.10,Portland,OR,US,45.5184,-122.6554:1167025926
+199.77.130.14,,,US,38.0000,-97.0000:1167025926
+200.120.113.79,Santiago,12,CL,-33.4500,-70.6667:1167025926
+200.121.55.151,Lima,15,PE,-12.0500,-77.0500:1167025926
+200.83.57.232,Santiago,12,CL,-33.4500,-70.6667:1167025926
+201.19.104.76,Rio De Janeiro,21,BR,-22.9000,-43.2333:1167025926
+201.21.16.8,São Paulo,27,BR,-23.5333,-46.6167:1167025926
+201.29.114.7,Rio De Janeiro,21,BR,-22.9000,-43.2333:1167025926
+201.86.211.16,Curitiba,18,BR,-25.4167,-49.2500:1167025926
+202.0.185.4,Perth,08,AU,-31.9333,115.8333:1167025926
+202.156.187.21,Singapore,00,SG,1.2931,103.8558:1167025926
+202.173.141.155,Hillcrest,04,AU,-17.3667,145.6000:1167025926
+202.180.170.109,Hong Kong,00,HK,22.2833,114.1500:1167025926
+202.198.102.114,Changchun,05,CN,43.8800,125.3228:1167025926
+202.38.199.64,Guangzhou,30,CN,23.1167,113.2500:1167025926
+203.128.110.219,Shenzhen,30,CN,22.5333,114.1333:1167025926
+203.218.152.73,Central District,00,HK,22.2833,114.1500:1167025926
+203.218.207.193,Central District,00,HK,22.2833,114.1500:1167025926
+203.59.30.114,Perth,08,AU,-31.9333,115.8333:1167025926
+203.81.239.153,,,PK,30.0000,70.0000:1167025926
+204.13.236.244,Red Oak,TX,US,32.5227,-96.8048:1167025926
+204.15.133.171,Dana Point,CA,US,33.4782,-117.7064:1167025926
+204.253.162.11,San Francisco,CA,US,37.7645,-122.4294:1167025926
+205.244.242.67,Orlando,FL,US,28.5037,-81.3306:1167025926
+206.124.149.146,Bellevue,WA,US,47.6051,-122.1134:1167025926
+206.13.125.181,Rancho Cordova,CA,US,38.5882,-121.2222:1167025926
+206.174.19.25,Fairbanks,AK,US,64.8834,-147.4985:1167025926
+206.174.40.86,Anchorage,AK,US,61.1886,-149.8878:1167025926
+206.51.237.8,Tampa,FL,US,27.9578,-82.4622:1167025926
+207.174.191.134,Berthoud,CO,US,40.2912,-105.0816:1167025926
+207.180.130.205,Allston,MA,US,42.3596,-71.1287:1167025926
+207.210.106.130,Atlanta,GA,US,33.7516,-84.3915:1167025926
+207.210.106.7,Atlanta,GA,US,33.7516,-84.3915:1167025926
+207.210.113.251,Atlanta,GA,US,33.7516,-84.3915:1167025926
+207.234.208.117,Fort Lauderdale,FL,US,26.1882,-80.1711:1167025926
+207.241.238.23,San Francisco,CA,US,37.7645,-122.4294:1167025926
+207.36.232.16,Fort Lauderdale,FL,US,26.1882,-80.1711:1167025926
+207.36.232.246,Fort Lauderdale,FL,US,26.1882,-80.1711:1167025926
+207.44.180.3,Houston,TX,US,29.9342,-95.4057:1167025926
+207.44.180.92,Houston,TX,US,29.9342,-95.4057:1167025926
+207.7.145.213,San Francisco,CA,US,37.7758,-122.4128:1167025926
+208.106.21.4,Santa Rosa,CA,US,38.3928,-122.7507:1167025926
+208.14.31.5,Sherman,TX,US,33.5960,-96.5454:1167025926
+208.201.234.2,San Rafael,CA,US,37.9980,-122.5212:1167025926
+208.40.218.136,Orland Park,IL,US,41.6044,-87.8895:1167025926
+208.50.55.210,Los Angeles,CA,US,34.0416,-118.2988:1167025926
+208.64.240.163,Olympia,WA,US,47.1032,-122.8649:1167025926
+208.67.219.40,San Francisco,CA,US,37.7898,-122.3942:1167025926
+208.96.86.212,Sudbury,ON,CA,46.5000,-80.9667:1167025926
+209.120.232.116,Dallas,TX,US,32.9143,-96.7366:1167025926
+209.133.65.222,San Francisco,CA,US,37.7989,-122.3984:1167025926
+209.147.127.221,Tacoma,WA,US,47.2626,-122.4413:1167025926
+209.160.32.149,Washington,DC,US,38.9097,-77.0231:1167025926
+209.172.52.78,Cave Creek,AZ,US,33.8045,-111.9318:1167025926
+209.190.4.187,Columbus,OH,US,39.9653,-83.0235:1167025926
+209.221.138.34,Seattle,WA,US,47.5951,-122.3326:1167025926
+209.221.193.39,Palmdale,CA,US,34.5200,-118.0835:1167025926
+209.221.206.114,Palmdale,CA,US,34.5200,-118.0835:1167025926
+209.237.225.244,San Francisco,CA,US,37.7691,-122.4449:1167025926
+209.237.230.67,San Francisco,CA,US,37.7758,-122.4128:1167025926
+209.30.229.153,Norman,OK,US,35.2344,-97.4141:1167025926
+209.51.169.86,Fremont,CA,US,37.5155,-121.8962:1167025926
+209.61.158.5,San Antonio,TX,US,29.4244,-98.4842:1167025926
+209.8.40.177,Centreville,VA,US,38.8159,-77.4607:1167025926
+209.89.196.24,Calgary,AB,CA,51.0833,-114.0833:1167025926
+209.9.232.195,Silver Spring,MD,US,39.1047,-77.0768:1167025926
+212.101.19.178,Zuchwil,18,CH,47.2000,7.5667:1167025926
+212.108.197.46,Budapest,05,HU,47.5000,19.0833:1167025926
+212.112.241.137,,,DE,51.0000,9.0000:1167025926
+212.112.241.159,,,DE,51.0000,9.0000:1167025926
+212.112.242.159,,,DE,51.0000,9.0000:1167025926
+212.112.242.21,,,DE,51.0000,9.0000:1167025926
+212.120.86.43,Amsterdam,07,NL,52.3500,4.9167:1167025926
+212.160.136.249,Gdansk,82,PL,54.3500,18.6667:1167025926
+212.168.190.8,,,DE,51.0000,9.0000:1167025926
+212.187.48.185,Lelystad,16,NL,52.5167,5.4500:1167025926
+212.202.233.2,Koeln,07,DE,50.9333,6.9500:1167025926
+212.227.108.114,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+212.239.118.83,Como,09,IT,45.7833,9.0833:1167025926
+212.41.71.71,Zuchwil,18,CH,47.2000,7.5667:1167025926
+212.42.236.140,Sandstedt,06,DE,53.3667,8.5333:1167025926
+212.60.156.94,Radevormwald,07,DE,51.2000,7.3500:1167025926
+212.99.205.88,Eggenstein-Leopoldshafen,01,DE,49.0953,8.3906:1167025926
+213.113.151.40,Lidingö,26,SE,59.3667,18.1333:1167025926
+213.114.70.246,,,SE,62.0000,15.0000:1167025926
+213.133.103.150,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.133.126.124,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.146.114.96,Kamp,07,DE,50.9333,7.7833:1167025926
+213.161.192.240,Évry,A8,FR,48.6333,2.4500:1167025926
+213.168.104.211,Cologne,07,DE,50.9333,6.9500:1167025926
+213.17.104.91,Utrecht,09,NL,52.0833,5.1333:1167025926
+213.178.185.2,Gschwend,01,DE,48.9333,9.7332:1167025926
+213.189.20.167,Amstelveen,07,NL,52.3000,4.8667:1167025926
+213.196.253.102,Cologne,07,DE,50.9333,6.9500:1167025926
+213.203.214.130,Euskirchen,07,DE,50.6667,6.7833:1167025926
+213.211.241.33,Magdeburg,14,DE,52.1667,11.6667:1167025926
+213.218.161.250,Erkrath,07,DE,51.2167,6.9000:1167025926
+213.219.73.248,Tallinn,01,EE,59.4339,24.7281:1167025926
+213.228.241.143,London,P5,GB,51.5000,-0.1167:1167025926
+213.23.145.142,Berlin,16,DE,52.5167,13.4000:1167025926
+213.239.202.232,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.239.206.174,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.239.212.133,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.239.212.45,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.239.215.48,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.239.215.85,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+213.246.61.26,Verdun,B2,FR,49.1667,5.3833:1167025926
+213.39.128.25,Stillhorn,04,DE,53.4833,10.0333:1167025926
+213.39.210.101,Hamburg,04,DE,53.5500,10.0000:1167025926
+213.41.242.132,Paris,A8,FR,48.8667,2.3333:1167025926
+213.77.152.164,Tarnów,64,PL,50.0167,20.9832:1167025926
+213.84.147.225,Castricum,07,NL,52.5500,4.6667:1167025926
+213.84.192.84,Rijswijk,11,NL,52.0167,4.3333:1167025926
+213.84.74.36,Amsterdam,07,NL,52.3500,4.9167:1167025926
+213.84.94.72,Den Helder,07,NL,52.9667,4.7667:1167025926
+213.9.1.108,Duisburg,07,DE,51.4333,6.7500:1167025926
+216.137.65.86,Cedar Rapids,IA,US,41.9874,-91.6838:1167025926
+216.152.242.200,Santa Monica,CA,US,34.0256,-118.4716:1167025926
+216.194.67.53,Edmonton,AB,CA,53.5500,-113.5000:1167025926
+216.194.70.3,Avon,OH,US,41.4485,-82.0187:1167025926
+216.195.133.27,Manchester,NH,US,42.9841,-71.4487:1167025926
+216.231.47.120,Seattle,WA,US,47.5951,-122.3326:1167025926
+216.239.86.158,Farnham,QC,CA,45.2833,-72.9667:1167025926
+216.27.178.157,Hayward,CA,US,37.6503,-122.0730:1167025926
+216.55.149.21,San Diego,CA,US,32.9014,-117.2079:1167025926
+216.55.190.121,San Diego,CA,US,32.9014,-117.2079:1167025926
+217.10.142.173,Studley,Q4,GB,52.2667,-1.8833:1167025926
+217.11.54.81,,,DE,51.0000,9.0000:1167025926
+217.115.192.218,Amsterdam,07,NL,52.3500,4.9167:1167025926
+217.119.224.141,Voorhout,11,NL,52.2167,4.4832:1167025926
+217.121.116.186,Heemskerk,07,NL,52.5167,4.6667:1167025926
+217.129.54.210,Palmela,19,PT,38.5667,-8.9000:1167025926
+217.149.34.124,Schiphol,07,NL,52.3000,4.7500:1167025926
+217.160.111.190,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+217.160.176.49,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+217.160.203.26,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+217.160.219.14,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+217.172.183.219,,,DE,51.0000,9.0000:1167025926
+217.173.129.76,Hofheim,05,DE,50.0833,8.4500:1167025926
+217.173.170.167,Grupa,68,PL,53.5167,18.6333:1167025926
+217.174.17.109,Tehran,26,IR,35.6719,51.4244:1167025926
+217.187.163.146,Verl,07,DE,51.8833,8.5167:1167025926
+217.187.88.31,Eltville,05,DE,50.0333,8.1167:1167025926
+217.190.100.240,Verl,07,DE,51.8833,8.5167:1167025926
+217.196.64.205,Vienna,09,AT,48.2000,16.3667:1167025926
+217.20.112.191,Frankfurt,05,DE,50.1167,8.6833:1167025926
+217.20.117.129,Frankfurt,05,DE,50.1167,8.6833:1167025926
+217.20.117.240,Frankfurt,05,DE,50.1167,8.6833:1167025926
+217.20.117.92,Frankfurt,05,DE,50.1167,8.6833:1167025926
+217.20.121.40,Frankfurt,05,DE,50.1167,8.6833:1167025926
+217.207.174.83,London,P5,GB,51.5000,-0.1167:1167025926
+217.21.41.250,Minsk,04,BY,53.9000,27.5667:1167025926
+217.224.188.108,Leipzig,13,DE,51.3000,12.3333:1167025926
+217.226.21.51,Ratingen,07,DE,51.3000,6.8500:1167025926
+217.232.231.90,Mainz,08,DE,50.0000,8.2711:1167025926
+217.28.206.143,Göteborg,28,SE,57.7167,11.9667:1167025926
+217.30.178.243,Helsinki,13,FI,60.1756,24.9342:1167025926
+217.70.197.123,Kiel,10,DE,54.3333,10.1333:1167025926
+217.73.17.61,Bratislava,02,SK,48.1500,17.1167:1167025926
+217.75.133.182,Sofia,42,BG,42.6833,23.3167:1167025926
+218.111.161.90,Kuala Lumpur,14,MY,3.1667,101.7000:1167025926
+218.189.210.17,,,HK,22.2500,114.1667:1167025926
+218.190.57.132,,,HK,22.2500,114.1667:1167025926
+218.199.29.20,Wuhan,12,CN,30.5833,114.2667:1167025926
+218.206.99.50,,,CN,35.0000,105.0000:1167025926
+218.58.26.199,Shandong,07,CN,23.5878,117.3508:1167025926
+218.80.108.251,Shanghai,23,CN,31.2222,121.4581:1167025926
+218.81.108.71,Shanghai,23,CN,31.2222,121.4581:1167025926
+219.105.111.74,,,JP,36.0000,138.0000:1167025926
+219.163.49.83,Makito,09,JP,36.0500,136.9500:1167025926
+219.31.4.7,,,JP,36.0000,138.0000:1167025926
+219.79.83.193,Chung Kwai Chung,00,HK,22.3667,114.1333:1167025926
+219.94.59.46,Kuala Lumpur,14,MY,3.1667,101.7000:1167025926
+220.157.175.94,Asahi,04,JP,35.7167,140.6500:1167025926
+220.233.6.198,,,AU,-27.0000,133.0000:1167025926
+220.233.78.126,Forestville,02,AU,-33.7668,151.2083:1167025926
+220.234.12.16,Shanghai,23,CN,31.2222,121.4581:1167025926
+220.234.240.144,Shanghai,23,CN,31.2222,121.4581:1167025926
+220.84.182.251,,,KR,37.0000,127.5000:1167025926
+220.90.213.98,,,KR,37.0000,127.5000:1167025926
+221.137.209.179,Shanghai,23,CN,31.2222,121.4581:1167025926
+221.217.47.35,Beijing,22,CN,39.9289,116.3883:1167025926
+221.226.142.49,Beijing,22,CN,39.9289,116.3883:1167025926
+222.165.0.182,Singapore,00,SG,1.2931,103.8558:1167025926
+222.180.200.182,Beijing,22,CN,39.9289,116.3883:1167025926
+222.212.239.1,Beijing,22,CN,39.9289,116.3883:1167025926
+222.242.115.84,Beijing,22,CN,39.9289,116.3883:1167025926
+222.70.225.205,Beijing,22,CN,39.9289,116.3883:1167025926
+222.71.201.163,Beijing,22,CN,39.9289,116.3883:1167025926
+222.94.224.52,Beijing,22,CN,39.9289,116.3883:1167025926
+24.113.80.239,Port Orchard,WA,US,47.5061,-122.6208:1167025926
+24.136.24.119,Chicago,IL,US,41.8675,-87.6744:1167025926
+24.138.224.203,,,PR,18.2500,-66.5000:1167025926
+24.150.199.33,Beamsville,ON,CA,43.1667,-79.4667:1167025926
+24.155.215.181,San Marcos,TX,US,29.8729,-98.0140:1167025926
+24.168.217.245,Columbia,SC,US,34.0391,-80.9883:1167025926
+24.179.15.55,Saint Louis,MO,US,38.6385,-90.3026:1167025926
+24.18.230.103,Seattle,WA,US,47.5951,-122.3326:1167025926
+24.182.53.239,Sparks,NV,US,39.5727,-119.6171:1167025926
+24.196.147.65,Madison,WI,US,43.0714,-89.3932:1167025926
+24.21.201.6,Portland,OR,US,45.5184,-122.6554:1167025926
+24.21.205.90,Portland,OR,US,45.5184,-122.6554:1167025926
+24.220.124.136,Sioux Falls,SD,US,43.5398,-96.7163:1167025926
+24.223.168.237,Cincinnati,OH,US,39.1699,-84.4859:1167025926
+24.233.172.64,Fort Lauderdale,FL,US,26.1275,-80.2331:1167025926
+24.254.46.92,Baton Rouge,LA,US,30.4499,-91.0979:1167025926
+24.26.255.115,San Marcos,TX,US,29.8729,-98.0140:1167025926
+24.34.216.164,Madbury,NH,US,43.1704,-70.9275:1167025926
+24.48.198.156,Hartford,CT,US,41.7690,-72.6835:1167025926
+24.5.197.44,Berkeley,CA,US,37.8781,-122.2710:1167025926
+24.59.103.219,Ithaca,NY,US,42.4278,-76.4982:1167025926
+24.62.114.185,Carmel,NY,US,41.4324,-73.7167:1167025926
+24.68.28.35,Victoria,BC,CA,48.4333,-123.3500:1167025926
+24.69.163.170,Victoria,BC,CA,48.4333,-123.3500:1167025926
+24.8.169.149,Boulder,CO,US,40.0174,-105.2647:1167025926
+24.81.207.43,Calgary,AB,CA,51.0833,-114.0833:1167025926
+24.83.225.56,Vancouver,BC,CA,49.2500,-123.1333:1167025926
+24.85.98.1,Halifax,NS,CA,44.6500,-63.6000:1167025926
+24.9.154.217,Denver,CO,US,39.7437,-104.9793:1167025926
+24.9.185.227,Parker,CO,US,39.4985,-104.7224:1167025926
+24.93.137.236,Portland,ME,US,43.6724,-70.2849:1167025926
+24.96.149.124,Birmingham,AL,US,33.5054,-86.7987:1167025926
+35.10.112.176,East Lansing,MI,US,42.7283,-84.4883:1167025926
+58.14.96.6,Jinan,25,CN,36.6683,116.9972:1167025926
+58.20.201.165,Beijing,22,CN,39.9289,116.3883:1167025926
+59.134.15.153,,,JP,36.0000,138.0000:1167025926
+59.167.115.40,Boondall,04,AU,-27.3500,153.0666:1167025926
+59.167.55.142,,,AU,-27.0000,133.0000:1167025926
+59.189.60.20,Singapore,00,SG,1.2931,103.8558:1167025926
+59.78.48.101,Shanghai,23,CN,31.2222,121.4581:1167025926
+59.92.148.121,Bangalore,19,IN,12.9832,77.5833:1167025926
+60.166.98.164,Beijing,22,CN,39.9289,116.3883:1167025926
+60.241.213.19,,,AU,-27.0000,133.0000:1167025926
+60.242.61.254,Ryde,02,AU,-33.8167,151.1000:1167025926
+60.36.181.86,Tokyo,40,JP,35.6850,139.7514:1167025926
+60.63.146.2,Shanghai,23,CN,31.2222,121.4581:1167025926
+61.141.125.208,,,CN,35.0000,105.0000:1167025926
+61.152.238.73,Shanghai,23,CN,31.2222,121.4581:1167025926
+61.153.12.172,Wenzhou,02,CN,28.0192,120.6544:1167025926
+62.112.159.61,,,DE,51.0000,9.0000:1167025926
+62.121.31.116,Ipswich,N5,GB,52.0833,1.1667:1167025926
+62.136.77.88,,,GB,54.0000,-2.0000:1167025926
+62.141.56.164,Erfurt,15,DE,50.9833,11.0333:1167025926
+62.142.248.53,Espoo,13,FI,60.2167,24.6667:1167025926
+62.143.3.119,Düsseldorf,07,DE,51.2167,6.7667:1167025926
+62.146.202.66,Schwabach,02,DE,49.3292,11.0256:1167025926
+62.147.202.193,Villejuif,A8,FR,48.8000,2.3667:1167025926
+62.163.123.170,Rijswijk,11,NL,52.0167,4.3333:1167025926
+62.163.136.55,Amsterdam,07,NL,52.3500,4.9167:1167025926
+62.166.240.67,Amsterdam,07,NL,52.3500,4.9167:1167025926
+62.178.28.11,Vienna,09,AT,48.2000,16.3667:1167025926
+62.179.43.176,Warszawa,67,PL,52.2500,21.0000:1167025926
+62.197.40.155,Maidenhead,P9,GB,51.5167,-0.7000:1167025926
+62.21.79.146,Poznan,86,PL,52.4167,16.9667:1167025926
+62.214.192.99,Mainz,08,DE,50.0000,8.2711:1167025926
+62.241.240.86,Lohja,13,FI,60.2500,24.0833:1167025926
+62.30.110.38,,,GB,54.0000,-2.0000:1167025926
+62.48.34.110,Firenze,16,IT,43.7667,11.2500:1167025926
+62.48.42.77,Pietrasanta,16,IT,43.9500,10.2332:1167025926
+62.56.72.16,London,P5,GB,51.5000,-0.1167:1167025926
+62.58.61.172,Amsterdam,07,NL,52.3500,4.9167:1167025926
+62.75.129.201,Straße,07,DE,50.8667,7.4832:1167025926
+62.75.171.154,,,DE,51.0000,9.0000:1167025926
+62.75.185.15,,,DE,51.0000,9.0000:1167025926
+62.75.186.127,,,DE,51.0000,9.0000:1167025926
+62.75.214.113,,,DE,51.0000,9.0000:1167025926
+62.75.223.163,,,DE,51.0000,9.0000:1167025926
+62.75.252.130,,,DE,51.0000,9.0000:1167025926
+62.76.195.194,Irkutsk,20,RU,52.2667,104.3333:1167025926
+62.99.247.83,Graz,06,AT,47.0667,15.4500:1167025926
+63.199.8.158,Vacaville,CA,US,38.3507,-121.9326:1167025926
+63.223.98.53,,,A2,0.0000,0.0000:1167025926
+63.226.50.201,Phoenix,AZ,US,33.5222,-112.0839:1167025926
+63.228.65.81,Colorado Springs,CO,US,38.8326,-104.7405:1167025926
+63.249.91.56,Santa Cruz,CA,US,37.0101,-122.0324:1167025926
+63.85.194.6,Richardson,TX,US,32.9914,-96.6645:1167025926
+64.115.210.23,Horsham,PA,US,40.1883,-75.1502:1167025926
+64.122.12.107,Portland,OR,US,45.5184,-122.6554:1167025926
+64.136.200.11,Leawood,KS,US,38.9281,-94.6319:1167025926
+64.142.31.83,Concord,CA,US,37.9797,-122.0056:1167025926
+64.142.98.231,Santa Rosa,CA,US,38.3928,-122.7507:1167025926
+64.146.134.221,Stevenson,WA,US,45.7064,-121.7235:1167025926
+64.147.211.91,Asheville,NC,US,35.5900,-82.5581:1167025926
+64.157.15.26,Tampa,FL,US,27.9578,-82.4622:1167025926
+64.158.128.204,Phoenix,AZ,US,33.5222,-112.0839:1167025926
+64.164.59.200,Chino Hills,CA,US,33.9473,-117.7289:1167025926
+64.191.130.57,Lexington,KY,US,38.0462,-84.4978:1167025926
+64.222.145.151,Boston,MA,US,42.3425,-71.0677:1167025926
+64.235.254.241,Costa Mesa,CA,US,33.6793,-117.9055:1167025926
+64.246.50.101,Houston,TX,US,29.9342,-95.4057:1167025926
+64.26.169.184,Ottawa,ON,CA,45.4167,-75.7000:1167025926
+64.34.173.150,San Antonio,TX,US,29.4821,-98.4556:1167025926
+64.4.231.146,Wasilla,AK,US,61.5235,-149.5749:1167025926
+64.5.53.220,Dallas,TX,US,32.7825,-96.8207:1167025926
+64.5.53.254,Dallas,TX,US,32.7825,-96.8207:1167025926
+64.5.53.76,Dallas,TX,US,32.7825,-96.8207:1167025926
+64.62.190.126,Fremont,CA,US,37.5155,-121.8962:1167025926
+64.74.207.50,Atlanta,GA,US,33.7516,-84.3915:1167025926
+64.81.87.116,Los Angeles,CA,US,34.0416,-118.2988:1167025926
+64.95.64.86,Salem,MA,US,42.5153,-70.9075:1167025926
+65.100.76.221,Billings,MT,US,45.7750,-108.5262:1167025926
+65.102.228.49,Denver,CO,US,39.7437,-104.9793:1167025926
+65.111.168.165,Fort Lauderdale,FL,US,26.1209,-80.1273:1167025926
+65.174.217.58,Burlington,MA,US,42.5051,-71.2047:1167025926
+65.185.92.216,Kent,OH,US,41.1413,-81.3339:1167025926
+65.188.229.74,Winston Salem,NC,US,36.0864,-80.2636:1167025926
+65.189.179.203,Columbus,OH,US,39.9968,-82.9883:1167025926
+65.19.133.131,Fremont,CA,US,37.5155,-121.8962:1167025926
+65.19.76.88,Hinesburg,VT,US,44.3175,-73.0909:1167025926
+65.196.226.32,Columbus,IN,US,39.2141,-85.9283:1167025926
+65.254.53.63,Oakland,CA,US,37.7950,-122.2193:1167025926
+65.255.217.11,Long Beach,CA,US,33.7542,-118.2019:1167025926
+65.27.17.90,Leawood,KS,US,38.9281,-94.6319:1167025926
+65.29.115.195,Northville,MI,US,42.4165,-83.5297:1167025926
+65.33.62.157,Orlando,FL,US,28.5037,-81.3306:1167025926
+65.78.124.245,Easton,PA,US,40.6919,-75.2437:1167025926
+65.93.72.166,Kingston,ON,CA,44.3000,-76.5667:1167025926
+66.109.132.244,Missoula,MT,US,46.8582,-113.9896:1167025926
+66.119.199.39,Colville,WA,US,48.6791,-117.7527:1167025926
+66.134.89.225,San Jose,CA,US,37.3073,-121.8569:1167025926
+66.135.40.74,San Antonio,TX,US,29.4821,-98.4556:1167025926
+66.139.77.37,,,US,38.0000,-97.0000:1167025926
+66.150.225.130,Atlanta,GA,US,33.7516,-84.3915:1167025926
+66.151.73.244,Houston,TX,US,29.7755,-95.4152:1167025926
+66.177.158.245,Orange Park,FL,US,30.1311,-81.7560:1167025926
+66.180.163.4,Green Bay,WI,US,44.4889,-88.0705:1167025926
+66.185.124.20,Palatine,IL,US,42.1032,-88.0699:1167025926
+66.188.71.221,Athens,GA,US,33.9650,-83.3892:1167025926
+66.199.184.254,Vancouver,BC,CA,49.2500,-123.1333:1167025926
+66.199.236.130,Great River,NY,US,40.7263,-73.1577:1167025926
+66.199.236.138,Great River,NY,US,40.7263,-73.1577:1167025926
+66.199.240.50,Great River,NY,US,40.7263,-73.1577:1167025926
+66.199.252.58,Great River,NY,US,40.7263,-73.1577:1167025926
+66.215.147.99,Riverside,CA,US,33.9404,-117.3959:1167025926
+66.219.161.166,Doylestown,OH,US,40.9603,-81.6975:1167025926
+66.219.198.22,Salt Lake City,UT,US,40.7561,-111.8837:1167025926
+66.219.59.183,Austin,TX,US,30.4549,-97.7565:1167025926
+66.226.44.15,Yadkinville,NC,US,36.1242,-80.6351:1167025926
+66.228.127.27,Carrollton,TX,US,33.0035,-96.9000:1167025926
+66.235.25.15,Port Townsend,WA,US,48.0354,-122.8145:1167025926
+66.68.89.160,Austin,TX,US,30.3037,-97.7696:1167025926
+66.70.10.53,Hoboken,NJ,US,40.7458,-74.0321:1167025926
+66.90.89.162,Chicago,IL,US,41.8776,-87.6272:1167025926
+66.92.162.60,Ashburn,VA,US,39.0335,-77.4838:1167025926
+66.92.188.226,Emeryville,CA,US,37.8342,-122.2897:1167025926
+66.92.216.74,Los Angeles,CA,US,34.0530,-118.2642:1167025926
+66.92.65.81,Strasburg,VA,US,39.0488,-78.3740:1167025926
+66.93.16.253,Chicago,IL,US,41.8998,-87.6368:1167025926
+66.93.170.242,San Francisco,CA,US,37.7758,-122.4128:1167025926
+66.93.26.112,Dallas,TX,US,32.7825,-96.8207:1167025926
+66.96.192.44,Scranton,PA,US,41.3731,-75.6837:1167025926
+66.98.136.49,Houston,TX,US,29.9342,-95.4057:1167025926
+66.98.208.43,Houston,TX,US,29.9342,-95.4057:1167025926
+67.10.74.97,Houston,TX,US,29.7755,-95.4152:1167025926
+67.102.35.23,Melrose Park,IL,US,41.9107,-87.8783:1167025926
+67.15.225.36,Houston,TX,US,29.9342,-95.4057:1167025926
+67.159.27.27,Chicago,IL,US,41.8776,-87.6272:1167025926
+67.161.107.128,Port Orchard,WA,US,47.5061,-122.6208:1167025926
+67.162.208.135,Adrian,MI,US,41.8934,-84.0659:1167025926
+67.168.216.252,Portland,OR,US,45.5184,-122.6554:1167025926
+67.171.241.35,Plano,TX,US,33.0483,-96.7347:1167025926
+67.173.143.46,Wood Dale,IL,US,41.9664,-87.9811:1167025926
+67.173.253.192,Boulder,CO,US,40.0174,-105.2647:1167025926
+67.43.175.98,Venice,CA,US,33.9944,-118.4639:1167025926
+67.68.76.168,Lachine,QC,CA,45.4167,-73.6667:1167025926
+67.70.49.123,Timmins,ON,CA,48.4667,-81.3333:1167025926
+67.80.106.153,Wayne,NJ,US,40.9487,-74.2413:1167025926
+67.81.126.205,Elizabeth,NJ,US,40.6636,-74.1991:1167025926
+67.88.160.77,Claremont,NH,US,43.3592,-72.3363:1167025926
+68.100.117.36,Reston,VA,US,38.9579,-77.3439:1167025926
+68.101.42.157,Mc Lean,VA,US,38.9399,-77.1902:1167025926
+68.107.40.142,Solana Beach,CA,US,32.9959,-117.2571:1167025926
+68.117.130.197,Madison,WI,US,43.0714,-89.3932:1167025926
+68.12.38.243,Choctaw,OK,US,35.4568,-97.2652:1167025926
+68.165.199.42,Denver,CO,US,39.7437,-104.9793:1167025926
+68.167.210.88,San Jose,CA,US,37.3874,-121.9024:1167025926
+68.174.111.45,New York,NY,US,40.7619,-73.9763:1167025926
+68.175.30.154,New York,NY,US,40.7619,-73.9763:1167025926
+68.195.153.229,Centereach,NY,US,40.8732,-73.0812:1167025926
+68.2.126.115,Queen Creek,AZ,US,33.1983,-111.6041:1167025926
+68.209.227.10,Chicago,IL,US,41.8675,-87.6744:1167025926
+68.210.143.66,Orlando,FL,US,28.5037,-81.3306:1167025926
+68.225.142.28,Omaha,NE,US,41.2603,-96.0463:1167025926
+68.225.167.35,Oklahoma City,OK,US,35.4715,-97.5190:1167025926
+68.226.79.67,Omaha,NE,US,41.2603,-96.0463:1167025926
+68.228.227.181,Phoenix,AZ,US,33.5222,-112.0839:1167025926
+68.229.192.241,Oklahoma City,OK,US,35.4715,-97.5190:1167025926
+68.237.102.68,New York,NY,US,40.7619,-73.9763:1167025926
+68.38.141.251,Bethpage,NY,US,40.7405,-73.4840:1167025926
+68.39.131.28,Old Bridge,NJ,US,40.3958,-74.3255:1167025926
+68.43.251.39,Farmington,MI,US,42.4831,-83.3774:1167025926
+68.47.136.99,Little Rock,AR,US,34.7338,-92.3665:1167025926
+68.48.84.247,Gambrills,MD,US,39.0529,-76.6811:1167025926
+68.52.222.138,Franklin,TN,US,35.9340,-86.8878:1167025926
+68.52.247.208,Hendersonville,TN,US,36.3479,-86.6005:1167025926
+68.61.232.202,Pontiac,MI,US,42.6474,-83.2862:1167025926
+68.62.77.111,Royal Oak,MI,US,42.5055,-83.1527:1167025926
+68.85.149.9,Troy,MI,US,42.5778,-83.1482:1167025926
+68.94.63.211,,,US,38.0000,-97.0000:1167025926
+68.95.232.184,Plano,TX,US,33.0483,-96.7347:1167025926
+69.113.27.92,Eatontown,NJ,US,40.3039,-74.0703:1167025926
+69.114.159.231,Brentwood,NY,US,40.7810,-73.2522:1167025926
+69.12.145.165,Sunnyvale,CA,US,37.3842,-122.0196:1167025926
+69.13.8.97,Fort Worth,TX,US,32.7492,-97.2205:1167025926
+69.132.182.220,Charlotte,NC,US,35.2060,-80.8290:1167025926
+69.154.119.117,Siloam Springs,AR,US,36.1690,-94.4564:1167025926
+69.165.250.121,Pompano Beach,FL,US,26.2600,-80.1917:1167025926
+69.170.55.89,Lynchburg,VA,US,37.3776,-79.1691:1167025926
+69.180.189.186,Saint Paul,MN,US,44.9487,-93.1002:1167025926
+69.20.97.236,San Jose,CA,US,37.3874,-121.9024:1167025926
+69.207.183.91,Rochester,NY,US,43.1693,-77.6189:1167025926
+69.209.113.229,Hopkins,MI,US,42.6180,-85.7212:1167025926
+69.247.144.70,,,US,38.0000,-97.0000:1167025926
+69.251.182.82,Bethesda,MD,US,38.9878,-77.1262:1167025926
+69.30.67.184,Beaverton,OR,US,45.4962,-122.8019:1167025926
+69.31.42.139,New York,NY,US,40.6888,-74.0203:1167025926
+69.41.174.196,Dallas,TX,US,32.8120,-96.8143:1167025926
+69.55.237.39,San Diego,CA,US,32.7191,-117.1607:1167025926
+69.57.148.142,Houston,TX,US,29.9342,-95.4057:1167025926
+69.68.160.78,New Vernon,NJ,US,40.7264,-74.4871:1167025926
+69.71.171.12,Gillette,WY,US,44.5562,-105.6665:1167025926
+69.72.254.10,Clifton,NJ,US,40.8326,-74.1307:1167025926
+69.86.56.5,New York,NY,US,40.7619,-73.9763:1167025926
+70.101.164.134,Houston,TX,US,29.7755,-95.4152:1167025926
+70.109.130.25,Hanover,NH,US,43.7226,-72.1342:1167025926
+70.110.70.238,Valrico,FL,US,27.9158,-82.2290:1167025926
+70.130.149.93,Vancouver,WA,US,45.6676,-122.6063:1167025926
+70.135.13.155,Oklahoma City,OK,US,35.4715,-97.5190:1167025926
+70.176.89.164,Glendale,AZ,US,33.5905,-112.2099:1167025926
+70.178.80.216,Springfield,MO,US,37.1884,-93.2914:1167025926
+70.179.119.185,Burke,VA,US,38.7851,-77.2867:1167025926
+70.181.253.145,San Diego,CA,US,32.7977,-117.1322:1167025926
+70.188.190.20,Boxford,MA,US,42.6790,-71.0292:1167025926
+70.225.160.237,New Berlin,WI,US,42.9721,-88.1305:1167025926
+70.225.161.193,Sussex,WI,US,43.1488,-88.2451:1167025926
+70.227.79.37,Cleveland,OH,US,41.4789,-81.6473:1167025926
+70.238.166.217,Saint Louis,MO,US,38.6385,-90.3026:1167025926
+70.240.239.210,Houston,TX,US,29.7755,-95.4152:1167025926
+70.240.26.222,Little Rock,AR,US,34.7338,-92.3665:1167025926
+70.249.43.126,Baton Rouge,LA,US,30.4499,-91.0979:1167025926
+70.35.207.156,,,US,38.0000,-97.0000:1167025926
+70.39.64.150,,,US,38.0000,-97.0000:1167025926
+70.45.56.242,,,PR,18.2500,-66.5000:1167025926
+70.50.136.3,King City,ON,CA,43.9333,-79.5333:1167025926
+70.62.101.252,,NC,US,35.6442,-79.8266:1167025926
+70.81.119.223,Pierrefonds,QC,CA,45.4667,-73.8833:1167025926
+70.82.47.141,Montréal,QC,CA,45.5000,-73.5833:1167025926
+70.92.230.41,Fort Atkinson,WI,US,42.8987,-88.7991:1167025926
+71.108.253.198,,,US,38.0000,-97.0000:1167025926
+71.111.242.102,,,US,38.0000,-97.0000:1167025926
+71.112.124.225,Bothell,WA,US,47.7953,-122.2018:1167025926
+71.116.81.3,Los Gatos,CA,US,37.1991,-121.9619:1167025926
+71.133.227.217,Dallas,TX,US,32.7791,-96.8028:1167025926
+71.145.183.134,Seattle,WA,US,47.5951,-122.3326:1167025926
+71.146.73.251,Dallas,TX,US,32.7791,-96.8028:1167025926
+71.149.171.169,Dallas,TX,US,32.7791,-96.8028:1167025926
+71.168.243.153,,,US,38.0000,-97.0000:1167025926
+71.202.233.24,San Jose,CA,US,37.3073,-121.8569:1167025926
+71.221.68.187,Denver,CO,US,39.7525,-104.9995:1167025926
+71.222.54.43,Denver,CO,US,39.7525,-104.9995:1167025926
+71.230.172.208,,,US,38.0000,-97.0000:1167025926
+71.233.40.61,,,US,38.0000,-97.0000:1167025926
+71.235.222.147,,CT,US,41.5924,-72.7624:1167025926
+71.242.124.82,,,US,38.0000,-97.0000:1167025926
+71.245.169.148,South Salem,NY,US,41.2550,-73.5409:1167025926
+71.251.179.145,Lehi,UT,US,40.3245,-111.9618:1167025926
+71.252.183.92,,,US,38.0000,-97.0000:1167025926
+71.254.116.90,Gilbert,AZ,US,33.3202,-111.7610:1167025926
+71.32.102.145,Albuquerque,NM,US,35.1025,-106.6117:1167025926
+71.42.46.180,Herndon,VA,US,38.9266,-77.3937:1167025926
+71.56.235.157,Fort Collins,CO,US,40.5610,-105.0536:1167025926
+71.61.19.188,,,US,38.0000,-97.0000:1167025926
+71.81.41.186,Durham,NC,US,35.9925,-78.9017:1167025926
+72.130.224.164,San Francisco,CA,US,37.7645,-122.4294:1167025926
+72.148.54.247,,,US,38.0000,-97.0000:1167025926
+72.193.22.68,Vancouver,WA,US,45.6676,-122.6063:1167025926
+72.199.231.92,Atlanta,GA,US,33.8767,-84.3342:1167025926
+72.200.184.221,Atlanta,GA,US,33.8767,-84.3342:1167025926
+72.22.92.63,Santa Monica,CA,US,34.0119,-118.4682:1167025926
+72.225.234.118,New York,NY,US,40.7619,-73.9763:1167025926
+72.226.235.52,Branford,CT,US,41.2864,-72.7956:1167025926
+72.36.146.117,Dallas,TX,US,32.9988,-96.7831:1167025926
+72.36.239.30,Dallas,TX,US,32.9988,-96.7831:1167025926
+72.36.245.34,Saint Petersburg,66,RU,59.8944,30.2642:1167025926
+72.40.1.164,Altamonte Springs,FL,US,28.6645,-81.3925:1167025926
+72.5.28.193,Newton Highlands,MA,US,42.3169,-71.2082:1167025926
+72.51.43.205,San Antonio,TX,US,29.4821,-98.4556:1167025926
+72.9.108.50,Great River,NY,US,40.7263,-73.1577:1167025926
+74.0.33.114,San Jose,CA,US,37.3874,-121.9024:1167025926
+74.100.7.19,,,CA,60.0000,-95.0000:1167025926
+74.118.14.105,,,CA,60.0000,-95.0000:1167025926
+74.120.203.162,,,CA,60.0000,-95.0000:1167025926
+74.67.42.57,,NY,US,42.1436,-74.9306:1167025926
+74.98.65.109,,,CA,60.0000,-95.0000:1167025926
+75.179.149.5,,,US,38.0000,-97.0000:1167025926
+75.58.35.155,UNKNOWN:1167025926
+75.6.227.120,Dallas,TX,US,32.7791,-96.8028:1167025926
+75.6.236.173,Dallas,TX,US,32.7791,-96.8028:1167025926
+75.70.29.43,,,US,38.0000,-97.0000:1167025926
+75.72.68.25,,,US,38.0000,-97.0000:1167025926
+75.75.107.239,,,US,38.0000,-97.0000:1167025926
+75.83.254.241,UNKNOWN:1167025926
+76.173.53.59,Herndon,VA,US,38.9266,-77.3937:1167025926
+76.174.155.70,Herndon,VA,US,38.9266,-77.3937:1167025926
+76.185.154.229,Herndon,VA,US,38.9266,-77.3937:1167025926
+76.186.80.95,Herndon,VA,US,38.9266,-77.3937:1167025926
+76.212.64.227,UNKNOWN:1167025926
+76.4.42.130,Winter Park,FL,US,28.6024,-81.3589:1167025926
+77.176.129.72,UNKNOWN:1167025926
+77.179.27.104,UNKNOWN:1167025926
+77.181.111.145,UNKNOWN:1167025926
+77.181.217.188,UNKNOWN:1167025926
+8.7.49.192,Tempe,AZ,US,33.4357,-111.9171:1167025926
+80.104.249.55,Roma,07,IT,41.9000,12.4832:1167025926
+80.108.247.229,Vienna,09,AT,48.2000,16.3667:1167025926
+80.109.29.164,Vienna,09,AT,48.2000,16.3667:1167025926
+80.120.3.31,Attnang-Puchheim,04,AT,48.0083,13.7167:1167025926
+80.126.37.100,Rotterdam,11,NL,51.9167,4.5000:1167025926
+80.132.47.173,Bochum,07,DE,51.4833,7.2167:1167025926
+80.135.145.8,Cologne,07,DE,50.9333,6.9500:1167025926
+80.141.204.73,Bochum,07,DE,51.4833,7.2167:1167025926
+80.168.224.65,London,P5,GB,51.5000,-0.1167:1167025926
+80.190.242.122,,,DE,51.0000,9.0000:1167025926
+80.190.243.158,,,DE,51.0000,9.0000:1167025926
+80.190.250.108,,,DE,51.0000,9.0000:1167025926
+80.190.251.24,,,DE,51.0000,9.0000:1167025926
+80.203.145.142,Solum,17,NO,59.1167,9.4167:1167025926
+80.203.229.249,Skarvedalen,02,NO,58.4478,8.7533:1167025926
+80.203.75.100,Oslo,12,NO,59.9167,10.7500:1167025926
+80.212.89.16,Ytre Okslia,09,NO,67.1500,14.3333:1167025926
+80.219.32.210,Zürich,25,CH,47.3667,8.5500:1167025926
+80.221.202.100,Kantola,13,FI,60.7167,27.5333:1167025926
+80.222.238.225,,,FI,64.0000,26.0000:1167025926
+80.222.65.173,Helsinki,13,FI,60.1756,24.9342:1167025926
+80.223.106.128,Kuopio,14,FI,62.9000,27.6833:1167025926
+80.229.90.44,,,GB,54.0000,-2.0000:1167025926
+80.237.146.62,Koeln,07,DE,50.9333,6.9500:1167025926
+80.237.163.26,Koeln,07,DE,50.9333,6.9500:1167025926
+80.237.173.67,Koeln,07,DE,50.9333,6.9500:1167025926
+80.237.235.9,Koeln,07,DE,50.9333,6.9500:1167025926
+80.248.254.68,Espoo,13,FI,60.2167,24.6667:1167025926
+80.252.209.6,Göteborg,28,SE,57.7167,11.9667:1167025926
+80.48.115.20,Lask,58,PL,51.5833,19.1333:1167025926
+80.68.125.111,Vägen,22,SE,59.5167,14.3000:1167025926
+80.68.85.45,York,Q5,GB,53.9667,-1.0833:1167025926
+80.74.143.186,,,CH,47.0000,8.0000:1167025926
+80.74.148.176,,,CH,47.0000,8.0000:1167025926
+80.90.153.243,Bonn,07,DE,50.7333,7.1000:1167025926
+81.104.215.65,Cambridge,C3,GB,52.2000,0.1167:1167025926
+81.169.137.209,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.155.246,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.156.213,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.156.7,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.157.6,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.158.102,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.159.141,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.166.136,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.168.142,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.171.90,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.173.134,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.176.135,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.178.215,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.180.180,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.183.122,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.183.148,Berlin,16,DE,52.5167,13.4000:1167025926
+81.169.185.185,Berlin,16,DE,52.5167,13.4000:1167025926
+81.171.136.250,Gloucester,E6,GB,51.8333,-2.2500:1167025926
+81.186.252.4,Malmö,27,SE,55.6000,13.0000:1167025926
+81.216.158.19,Nora,26,SE,59.3167,18.5500:1167025926
+81.219.161.148,Warszawa,67,PL,52.2500,21.0000:1167025926
+81.227.231.218,Lund,27,SE,55.7000,13.1833:1167025926
+81.227.234.84,,,SE,62.0000,15.0000:1167025926
+81.241.54.64,Bruxelles,11,BE,50.8333,4.3333:1167025926
+81.3.21.5,Hannöver,06,DE,53.1833,8.5167:1167025926
+81.5.172.97,,,GB,54.0000,-2.0000:1167025926
+81.53.202.35,Nantes,B5,FR,47.2167,-1.5500:1167025926
+81.56.238.202,Paris,A8,FR,48.8667,2.3333:1167025926
+81.57.158.21,Hénin-Beaumont,B4,FR,50.4167,2.9333:1167025926
+81.57.208.135,Gonesse,A8,FR,48.9833,2.4500:1167025926
+81.57.40.124,Paris,A8,FR,48.8667,2.3333:1167025926
+81.57.77.179,Laval,B5,FR,48.0667,-0.7667:1167025926
+81.69.20.128,Velsen-Zuid,07,NL,52.4667,4.6333:1167025926
+81.71.27.189,Bussum,07,NL,52.2833,5.2000:1167025926
+81.97.12.185,Stretford,O6,GB,53.4500,-2.3167:1167025926
+82.103.132.227,,,DK,56.0000,10.0000:1167025926
+82.103.133.88,,,DK,56.0000,10.0000:1167025926
+82.103.134.251,,,DK,56.0000,10.0000:1167025926
+82.103.134.253,,,DK,56.0000,10.0000:1167025926
+82.103.219.67,,,FI,64.0000,26.0000:1167025926
+82.12.95.82,West Horsley,B3,GB,51.2667,-0.4500:1167025926
+82.128.215.12,Helsinki,13,FI,60.1756,24.9342:1167025926
+82.133.89.73,,,GB,54.0000,-2.0000:1167025926
+82.139.2.217,Legnica,41,PL,51.2000,16.2000:1167025926
+82.141.93.31,Ylivieska,08,FI,64.0833,24.5500:1167025926
+82.147.160.168,Tallinn,01,EE,59.4339,24.7281:1167025926
+82.149.72.85,Heroldsberg,02,DE,49.5339,11.1556:1167025926
+82.158.167.137,Getafe,29,ES,40.3000,-3.7167:1167025926
+82.165.144.169,,OH,US,40.3914,-82.7526:1167025926
+82.165.180.112,,OH,US,40.3914,-82.7526:1167025926
+82.182.109.115,Mölnlycke,28,SE,57.6500,12.1333:1167025926
+82.182.59.155,Nacka,24,SE,62.4739,17.4161:1167025926
+82.212.19.166,Eggenstein-Leopoldshafen,01,DE,49.0953,8.3906:1167025926
+82.214.2.226,Göteborg,28,SE,57.7167,11.9667:1167025926
+82.227.12.18,Taverny,A8,FR,49.0333,2.2167:1167025926
+82.227.61.106,Paris,A8,FR,48.8667,2.3333:1167025926
+82.228.218.46,Saint-Mandé,A8,FR,48.8333,2.4167:1167025926
+82.230.5.123,Paris,A8,FR,48.8667,2.3333:1167025926
+82.231.111.160,Pont Du Loup,B8,FR,43.7167,7.0000:1167025926
+82.231.59.44,Saint-Mandé,A8,FR,48.8333,2.4167:1167025926
+82.233.182.73,Reims,A4,FR,49.2500,4.0333:1167025926
+82.233.236.81,Entremont,B9,FR,45.4333,5.8833:1167025926
+82.234.133.30,Nice,B8,FR,43.7000,7.2500:1167025926
+82.234.199.149,Lyon,B9,FR,45.7500,4.8500:1167025926
+82.235.251.252,Montpellier,A9,FR,43.6000,3.8833:1167025926
+82.240.206.88,Rennes,A2,FR,48.0833,-1.6833:1167025926
+82.241.115.49,Saverne,C1,FR,48.7333,7.3667:1167025926
+82.246.161.47,Paris,A8,FR,48.8667,2.3333:1167025926
+82.247.153.205,Paris,A8,FR,48.8667,2.3333:1167025926
+82.250.35.246,Paris,A8,FR,48.8667,2.3333:1167025926
+82.251.0.253,Nantes,B5,FR,47.2167,-1.5500:1167025926
+82.39.105.99,Newcastle Upon Tyne,I7,GB,54.9881,-1.6195:1167025926
+82.41.194.157,Irvine,V7,GB,55.6000,-4.6667:1167025926
+82.41.245.107,Edinburgh,U8,GB,55.9500,-3.2000:1167025926
+82.46.19.152,,,GB,54.0000,-2.0000:1167025926
+82.48.223.220,Nespoledo,06,IT,45.9831,13.0908:1167025926
+82.55.189.113,Bresso,09,IT,45.5333,9.1833:1167025926
+82.56.179.123,Cassano Delle Murge,13,IT,40.8833,16.7667:1167025926
+82.59.66.4,Bertinoro,05,IT,44.1469,12.1389:1167025926
+82.6.104.255,,,GB,54.0000,-2.0000:1167025926
+82.61.64.222,Forlì,05,IT,44.2236,12.0528:1167025926
+82.65.55.229,Paris,A8,FR,48.8667,2.3333:1167025926
+82.66.88.236,Nogent-sur-Oise,B6,FR,49.2667,2.4667:1167025926
+82.67.91.66,Rouen,A7,FR,49.4333,1.0833:1167025926
+82.69.134.186,Rochdale,L2,GB,53.6167,-2.1500:1167025926
+82.69.174.251,Rochdale,L2,GB,53.6167,-2.1500:1167025926
+82.78.122.16,Bucharest,10,RO,44.4333,26.1000:1167025926
+82.78.148.108,Brasov,09,RO,45.6333,25.5833:1167025926
+82.79.221.151,Craiova,17,RO,44.3167,23.8000:1167025926
+82.83.201.167,Eschborn,05,DE,50.1333,8.5500:1167025926
+82.9.83.175,,,GB,54.0000,-2.0000:1167025926
+82.93.56.108,Voorhout,11,NL,52.2167,4.4832:1167025926
+82.94.251.206,Amsterdam,07,NL,52.3500,4.9167:1167025926
+82.99.212.192,Iran,03,IR,32.0922,51.0289:1167025926
+82.99.242.108,Iran,03,IR,32.0922,51.0289:1167025926
+83.125.32.209,Bocholt,07,DE,51.8333,6.6000:1167025926
+83.156.92.172,Paris,A8,FR,48.8667,2.3333:1167025926
+83.16.228.227,Bobolice,29,PL,50.6167,19.5000:1167025926
+83.160.188.223,Rijnsburg,11,NL,52.1833,4.4500:1167025926
+83.160.194.169,Rotterdam,11,NL,51.9167,4.5000:1167025926
+83.160.255.58,Amsterdam,07,NL,52.3500,4.9167:1167025926
+83.167.96.186,Chertanovo,69,RU,55.0167,34.9128:1167025926
+83.168.118.109,Szczecin,87,PL,53.4167,14.5833:1167025926
+83.171.151.199,Mittelheubronn,01,DE,47.8000,7.8167:1167025926
+83.171.167.241,Alsdorf,07,DE,50.8833,6.1667:1167025926
+83.171.180.205,,,DE,51.0000,9.0000:1167025926
+83.176.126.110,Nespoledo,06,IT,45.9831,13.0908:1167025926
+83.181.145.248,,,NL,52.5000,5.7500:1167025926
+83.181.255.67,,,IT,42.8333,12.8333:1167025926
+83.198.208.57,Montesson,A8,FR,48.9167,2.1500:1167025926
+83.216.204.134,Vienna,09,AT,48.2000,16.3667:1167025926
+83.219.212.101,Malmö,27,SE,55.6000,13.0000:1167025926
+83.228.200.221,Pully,23,CH,46.5167,6.6500:1167025926
+83.233.102.186,Västerås,25,SE,59.6167,16.5500:1167025926
+83.233.144.246,,,SE,62.0000,15.0000:1167025926
+83.243.112.242,Muenchen,02,DE,48.1500,11.5833:1167025926
+83.246.118.110,Hannöver,06,DE,53.1833,8.5167:1167025926
+83.249.45.168,Uppsala,26,SE,59.8667,17.6333:1167025926
+83.28.9.47,Lublin,75,PL,51.2500,22.5667:1167025926
+83.65.91.108,Wien,09,AT,48.2000,16.3667:1167025926
+83.85.103.98,Den Haag,11,NL,52.0833,4.3000:1167025926
+83.92.37.205,Odense,04,DK,55.4000,10.3833:1167025926
+83.94.221.195,Bellahøj,06,DK,55.7000,12.5167:1167025926
+84.10.130.174,Warszawa,67,PL,52.2500,21.0000:1167025926
+84.10.171.220,Szczecin,87,PL,53.4167,14.5833:1167025926
+84.108.143.20,,,IL,31.5000,34.7500:1167025926
+84.113.155.16,,,SE,62.0000,15.0000:1167025926
+84.115.144.151,,,SE,62.0000,15.0000:1167025926
+84.123.141.156,Madrid,29,ES,40.4000,-3.6833:1167025926
+84.130.87.90,Schenefeld,10,DE,53.6000,9.8167:1167025926
+84.132.218.175,Hasbergen,06,DE,52.2333,7.9333:1167025926
+84.134.122.79,Wolfenbüttel,06,DE,52.1667,10.5500:1167025926
+84.135.204.96,Zentbechhofen,02,DE,49.7667,10.9000:1167025926
+84.139.166.35,,,DE,51.0000,9.0000:1167025926
+84.141.194.17,Norderstedt,10,DE,53.7000,10.0167:1167025926
+84.146.209.127,Bochum,07,DE,51.4833,7.2167:1167025926
+84.146.83.39,Bochum,07,DE,51.4833,7.2167:1167025926
+84.148.206.90,Bamberg,02,DE,49.8667,10.8667:1167025926
+84.149.86.93,Mainz,08,DE,50.0000,8.2711:1167025926
+84.154.69.134,Karlsfeld,02,DE,48.2167,11.4667:1167025926
+84.154.96.121,Oberföhring,02,DE,48.1667,11.6333:1167025926
+84.155.119.28,Augsburg,02,DE,48.3667,10.8833:1167025926
+84.157.186.58,,,DE,51.0000,9.0000:1167025926
+84.16.226.169,Frankfurt,05,DE,50.1167,8.6833:1167025926
+84.16.233.47,Frankfurt,05,DE,50.1167,8.6833:1167025926
+84.16.234.49,Frankfurt,05,DE,50.1167,8.6833:1167025926
+84.16.235.143,Frankfurt,05,DE,50.1167,8.6833:1167025926
+84.16.243.41,Frankfurt,05,DE,50.1167,8.6833:1167025926
+84.165.115.150,Sulzbach,09,DE,49.3000,7.0667:1167025926
+84.167.242.44,Eggenstein-Leopoldshafen,01,DE,49.0953,8.3906:1167025926
+84.171.231.3,,,DE,51.0000,9.0000:1167025926
+84.174.95.50,Kirchzarten,01,DE,47.9667,7.9500:1167025926
+84.177.16.53,Bad Vilbel,05,DE,50.1833,8.7500:1167025926
+84.177.22.214,Frankfurt Am Main,05,DE,50.1167,8.6833:1167025926
+84.180.47.79,Hohenstein-Ernstthal,13,DE,50.8000,12.7167:1167025926
+84.181.135.9,Dreieich,05,DE,50.0000,8.7000:1167025926
+84.181.35.143,,,DE,51.0000,9.0000:1167025926
+84.183.249.41,Haldensleben,14,DE,52.3000,11.4167:1167025926
+84.19.177.90,Erfurt,15,DE,50.9833,11.0333:1167025926
+84.19.179.217,Erfurt,15,DE,50.9833,11.0333:1167025926
+84.19.181.66,Erfurt,15,DE,50.9833,11.0333:1167025926
+84.19.182.23,Erfurt,15,DE,50.9833,11.0333:1167025926
+84.190.80.250,Neueiche,11,DE,52.5500,13.5833:1167025926
+84.217.89.255,Stockholm,26,SE,59.3333,18.0500:1167025926
+84.220.96.185,Bologna,05,IT,44.4833,11.3333:1167025926
+84.221.125.52,Cagliari,14,IT,39.2167,9.1167:1167025926
+84.221.234.207,Cagliari,14,IT,39.2167,9.1167:1167025926
+84.221.74.22,Villa,05,IT,43.8000,11.6500:1167025926
+84.221.89.195,Cagliari,14,IT,39.2167,9.1167:1167025926
+84.223.81.95,Cagliari,14,IT,39.2167,9.1167:1167025926
+84.230.91.105,Jyväskylän Maalaiskunta,15,FI,62.2833,25.7167:1167025926
+84.241.8.41,Tehran,26,IR,35.6719,51.4244:1167025926
+84.248.1.11,Jyväskylän Maalaiskunta,15,FI,62.2833,25.7167:1167025926
+84.251.171.83,,,FI,64.0000,26.0000:1167025926
+84.30.70.185,Den Helder,07,NL,52.9667,4.7667:1167025926
+84.38.64.119,,,DE,51.0000,9.0000:1167025926
+84.38.64.155,,,DE,51.0000,9.0000:1167025926
+84.40.199.218,Wroclaw,72,PL,51.1000,17.0333:1167025926
+84.41.143.100,Den Helder,07,NL,52.9667,4.7667:1167025926
+84.41.177.144,Almere,16,NL,52.3667,5.1500:1167025926
+84.44.128.233,Cologne,07,DE,50.9333,6.9500:1167025926
+84.44.153.162,Cologne,07,DE,50.9333,6.9500:1167025926
+84.46.123.141,Mainz,08,DE,50.0000,8.2711:1167025926
+84.51.147.170,Nottingham,J8,GB,52.9667,-1.1667:1167025926
+84.55.87.137,Stockholm,26,SE,59.3333,18.0500:1167025926
+84.56.194.101,Waiblingen,01,DE,48.8333,9.3000:1167025926
+84.56.235.219,Eschborn,05,DE,50.1333,8.5500:1167025926
+84.56.58.248,Frankfurt Am Main,05,DE,50.1167,8.6833:1167025926
+84.61.174.127,Eschborn,05,DE,50.1333,8.5500:1167025926
+84.61.55.117,Ronnenberg,06,DE,52.3167,9.6500:1167025926
+84.62.30.157,Eschborn,05,DE,50.1333,8.5500:1167025926
+84.62.48.147,Eschborn,05,DE,50.1333,8.5500:1167025926
+84.85.160.44,Amersfoort,09,NL,52.1500,5.3833:1167025926
+84.92.202.141,Leatherhead,B8,GB,51.2833,-0.3167:1167025926
+85.10.192.137,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+85.10.198.236,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+85.10.200.47,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+85.10.219.107,Berlin,16,DE,52.5167,13.4000:1167025926
+85.10.227.182,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+85.10.240.250,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+85.113.253.203,Enschede,15,NL,52.2167,6.9000:1167025926
+85.14.217.51,Coburg,02,DE,50.2500,10.9667:1167025926
+85.140.206.20,Moscow,48,RU,55.7522,37.6156:1167025926
+85.16.7.33,Scharrhof,08,DE,49.3500,7.5500:1167025926
+85.176.156.98,Lübeck,10,DE,53.8667,10.7000:1167025926
+85.177.174.43,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.177.237.161,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.177.254.154,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.178.194.212,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.178.235.82,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.179.31.245,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.18.107.240,Padova,20,IT,45.4167,11.8833:1167025926
+85.180.82.65,Hamburg,04,DE,53.5500,10.0000:1167025926
+85.186.13.252,Marius,32,RO,47.6667,23.1833:1167025926
+85.187.152.189,Sofia,42,BG,42.6833,23.3167:1167025926
+85.187.71.144,Sofia,42,BG,42.6833,23.3167:1167025926
+85.210.210.15,Oxford,K2,GB,51.7500,-1.2500:1167025926
+85.214.18.185,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.19.110,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.24.183,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.26.150,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.27.102,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.29.61,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.29.9,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.29.92,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.36.108,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.39.206,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.48.49,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.49.175,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.50.115,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.54.254,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.57.226,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.58.238,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.59.49,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.63.253,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.68.105,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.68.153,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.68.60,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.70.47,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.73.63,Berlin,16,DE,52.5167,13.4000:1167025926
+85.214.90.235,Berlin,16,DE,52.5167,13.4000:1167025926
+85.22.23.242,Bochum,07,DE,51.4833,7.2167:1167025926
+85.225.170.99,,,SE,62.0000,15.0000:1167025926
+85.228.117.220,,,SE,62.0000,15.0000:1167025926
+85.228.163.219,,,SE,62.0000,15.0000:1167025926
+85.228.174.67,Visby,05,SE,57.6333,18.3000:1167025926
+85.230.111.30,Lövsta,24,SE,63.0000,17.0667:1167025926
+85.234.130.43,London,P5,GB,51.5000,-0.1167:1167025926
+85.25.132.119,,,DE,51.0000,9.0000:1167025926
+85.25.141.145,,,DE,51.0000,9.0000:1167025926
+85.25.141.60,,,DE,51.0000,9.0000:1167025926
+85.25.251.245,,,DE,51.0000,9.0000:1167025926
+85.25.253.104,,,DE,51.0000,9.0000:1167025926
+85.25.4.93,,,DE,51.0000,9.0000:1167025926
+85.25.66.207,,,DE,51.0000,9.0000:1167025926
+85.31.187.90,Jena,15,DE,50.9333,11.5833:1167025926
+85.57.142.194,Madrid,29,ES,40.4000,-3.6833:1167025926
+85.73.103.30,Sína,42,GR,36.8000,22.5000:1167025926
+85.75.125.161,Sína,42,GR,36.8000,22.5000:1167025926
+85.8.136.101,Castletown,V3,GB,58.5833,-3.3833:1167025926
+85.91.128.228,San Stefano,39,BG,42.5167,26.8833:1167025926
+85.92.188.248,Huddersfield,G8,GB,53.6500,-1.7833:1167025926
+86.124.72.215,Iasi,23,RO,47.1667,27.6000:1167025926
+86.56.26.161,Hannöver,06,DE,53.1833,8.5167:1167025926
+86.59.21.38,Klosterneuburg,03,AT,48.3000,16.3167:1167025926
+86.66.247.172,Billancourt,B6,FR,49.7167,2.8833:1167025926
+87.106.27.17,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+87.106.61.219,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+87.106.77.37,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+87.106.9.89,Karlsruhe,01,DE,49.0047,8.3858:1167025926
+87.11.9.109,Roma,07,IT,41.9000,12.4832:1167025926
+87.122.15.184,Stuttgart,01,DE,48.7667,9.1833:1167025926
+87.122.229.175,Quierschied,09,DE,49.3167,7.0500:1167025926
+87.123.184.82,Stuttgart,01,DE,48.7667,9.1833:1167025926
+87.165.129.9,,,DE,51.0000,9.0000:1167025926
+87.17.3.155,Roma,07,IT,41.9000,12.4832:1167025926
+87.187.106.196,,,DE,51.0000,9.0000:1167025926
+87.196.104.3,Lisbon,14,PT,38.7167,-9.1333:1167025926
+87.203.16.13,Sína,42,GR,36.8000,22.5000:1167025926
+87.206.140.172,Warszawa,67,PL,52.2500,21.0000:1167025926
+87.216.186.3,Madrid,29,ES,40.4000,-3.6833:1167025926
+87.217.59.122,Madrid,29,ES,40.4000,-3.6833:1167025926
+87.230.11.166,Koeln,07,DE,50.9333,6.9500:1167025926
+87.230.17.81,Höst,07,DE,51.6500,6.1833:1167025926
+87.240.14.41,Moscow,48,RU,55.7522,37.6156:1167025926
+87.240.16.118,Moscow,48,RU,55.7522,37.6156:1167025926
+87.247.65.88,,,LT,56.0000,24.0000:1167025926
+87.251.206.206,Helsingborg,27,SE,56.0500,12.7000:1167025926
+87.7.128.122,Roma,07,IT,41.9000,12.4832:1167025926
+87.78.202.216,Koeln,07,DE,50.9333,6.9500:1167025926
+87.8.46.169,Roma,07,IT,41.9000,12.4832:1167025926
+87.9.162.23,Roma,07,IT,41.9000,12.4832:1167025926
+87.9.232.253,Roma,07,IT,41.9000,12.4832:1167025926
+88.112.243.32,,,FI,64.0000,26.0000:1167025926
+88.112.76.19,,,FI,64.0000,26.0000:1167025926
+88.113.124.64,,,FI,64.0000,26.0000:1167025926
+88.114.205.247,,,FI,64.0000,26.0000:1167025926
+88.115.80.140,,,FI,64.0000,26.0000:1167025926
+88.149.167.40,Settimo,12,IT,45.1500,7.7667:1167025926
+88.162.149.207,Paris,A8,FR,48.8667,2.3333:1167025926
+88.191.12.12,Paris,A8,FR,48.8667,2.3333:1167025926
+88.191.24.77,Paris,A8,FR,48.8667,2.3333:1167025926
+88.191.27.169,Paris,A8,FR,48.8667,2.3333:1167025926
+88.191.39.4,Paris,A8,FR,48.8667,2.3333:1167025926
+88.192.202.241,,,FI,64.0000,26.0000:1167025926
+88.198.11.5,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.158.98,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.160.123,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.164.126,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.178.190,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.180.62,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.192.154,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.201.230,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.22.131,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.24.116,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.241.107,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.25.41,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.250.141,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.252.147,Berlin,16,DE,52.5167,13.4000:1167025926
+88.198.37.146,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.43.103,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.45.235,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.198.9.16,Gunzenhausen,02,DE,49.1000,10.7500:1167025926
+88.208.203.85,Gloucester,E6,GB,51.8333,-2.2500:1167025926
+88.210.40.163,Moscow,48,RU,55.7522,37.6156:1167025926
+88.217.46.86,Muenchen,02,DE,48.1500,11.5833:1167025926
+88.240.83.91,Ankara,68,TR,39.9272,32.8644:1167025926
+88.64.135.32,Eschborn,05,DE,50.1333,8.5500:1167025926
+88.72.231.145,Eschborn,05,DE,50.1333,8.5500:1167025926
+88.73.80.223,Eschborn,05,DE,50.1333,8.5500:1167025926
+88.74.143.217,Eschborn,05,DE,50.1333,8.5500:1167025926
+88.76.215.173,Eschborn,05,DE,50.1333,8.5500:1167025926
+88.76.254.104,Eschborn,05,DE,50.1333,8.5500:1167025926
+88.84.139.250,Frankfurt,05,DE,50.1167,8.6833:1167025926
+88.84.148.197,Frankfurt,05,DE,50.1167,8.6833:1167025926
+89.110.144.180,Montabaur,08,DE,50.4333,7.8333:1167025926
+89.110.147.209,Montabaur,08,DE,50.4333,7.8333:1167025926
+89.110.149.90,Montabaur,08,DE,50.4333,7.8333:1167025926
+89.110.156.203,Montabaur,08,DE,50.4333,7.8333:1167025926
+89.110.156.247,Montabaur,08,DE,50.4333,7.8333:1167025926
+89.124.164.5,Dublin,07,IE,53.3331,-6.2489:1167025926
+89.138.108.125,Haifa,04,IL,32.8156,34.9892:1167025926
+89.149.194.143,Frankfurt,05,DE,50.1167,8.6833:1167025926
+89.149.207.172,Frankfurt,05,DE,50.1167,8.6833:1167025926
+89.173.88.49,,,SK,48.6667,19.5000:1167025926
+89.178.46.215,Moscow,48,RU,55.7522,37.6156:1167025926
+89.38.26.26,Bucuresti,10,RO,44.4333,26.1000:1167025926
+89.54.166.16,Kiel,10,DE,54.3333,10.1333:1167025926
+89.56.225.122,Kiel,10,DE,54.3333,10.1333:1167025926
+89.86.213.59,,,FR,46.0000,2.0000:1167025926
+89.98.125.96,,,NL,52.5000,5.7500:1167025926
+90.5.184.127,Poitiers,B7,FR,46.5833,0.3333:1167025926
+91.0.81.185,,,DE,51.0000,9.0000:1167025926
+91.91.248.22,Billancourt,B6,FR,49.7167,2.8833:1167025926
Deleted: releases/vidalia-0.0.10/pkg/win32/build-bundle.txt
===================================================================
--- trunk/pkg/win32/build-bundle.txt 2006-12-17 04:13:16 UTC (rev 1539)
+++ releases/vidalia-0.0.10/pkg/win32/build-bundle.txt 2006-12-26 02:02:23 UTC (rev 1559)
@@ -1,55 +0,0 @@
- Building the Vidalia/Tor/Privoxy/Torbutton Bundle
-
-
-1. Create a base directory under which the necessary sources will be extracted
-and place vidalia-bundle.nsi and all language-specific .nsh files in it. For
-this example, we will just use C:\bundle\.
-
- C:\bundle\vidalia-bundle.nsi
- C:\bundle\vidalia_en.nsh
- [...]
- C:\bundle\vidalia_ru.sh
-
-
-2. Create directories for each component in the bundle.
-
- C:\bundle\privoxy\
- C:\bundle\tor\
- C:\bundle\vidalia\
- C:\bundle\torbutton\
-
-3. Modify the appropriate version values (VIDALIA_APPVERSION, TOR_APPVERSION,
-PRIVOXY_APPVERSION, and TORBUTTON_APPVERSION) at the top of vidalia-bundle.nsi.
-
-4. Create directories for the appropriate versions of each component.
-
- C:\bundle\privoxy\3.0.3\
- C:\bundle\tor\0.1.1.20\
- C:\bundle\vidalia\0.0.6\
- C:\bundle\torbutton\1.0.4-fx+tb\
-
-5. Install Vidalia, Tor, and Privoxy to the directories you created for them
-in Step 4. Remember that you may need to grab the torrc.sample file from
-%APPDATA%\Tor that was created by Tor's installer and place it in the directory
-for the bundle's version of Tor.
-
-6. Place the Torbutton Firefox extension (.xpi) in the directory you created
-for it in Step 4.
-
-7. Modify Privoxy's config.txt file as follows:
-
- * Add "forward-socks4a / localhost:9050 ." (without quotes) to the top
- * Comment out "logfile privoxy.log" in Section 1.5
- * Comment out "jarfile jar.log" in Section 1.6
- * Uncomment "log-messages 1" in Section 6 and change the '1' to a '0'
-
-8. Run the vidalia-bundle.nsi script. The bundle will be named according the
-the versions you specified in Step 4 and placed in the base directory created
-in Step 1.
-
---------------------------------------------------------------------------------
-
-For each additional release of some component of the bundle, follow Steps 4-8.
-If the version of some component didn't change, you can skip its step. For
-example, if the version of Privoxy didn't change then you can skip Step 7.
-
Copied: releases/vidalia-0.0.10/pkg/win32/build-bundle.txt (from rev 1553, trunk/pkg/win32/build-bundle.txt)
===================================================================
--- releases/vidalia-0.0.10/pkg/win32/build-bundle.txt (rev 0)
+++ releases/vidalia-0.0.10/pkg/win32/build-bundle.txt 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,58 @@
+ Building the Vidalia/Tor/Privoxy/Torbutton Bundle
+
+
+1. Create a base directory under which the necessary sources will be extracted
+and place vidalia-bundle.nsi and all language-specific .nsh files in it. For
+this example, we will just use C:\bundle\.
+
+ C:\bundle\vidalia-bundle.nsi
+ C:\bundle\vidalia_en.nsh
+ [...]
+ C:\bundle\vidalia_ru.sh
+
+
+2. Create directories for each component in the bundle.
+
+ C:\bundle\privoxy\
+ C:\bundle\tor\
+ C:\bundle\vidalia\
+ C:\bundle\torbutton\
+
+3. Modify the appropriate version values (VIDALIA_APPVERSION, TOR_APPVERSION,
+PRIVOXY_APPVERSION, and TORBUTTON_APPVERSION) at the top of vidalia-bundle.nsi.
+
+4. Create directories for the appropriate versions of each component.
+
+ C:\bundle\privoxy\3.0.3\
+ C:\bundle\tor\0.1.1.20\
+ C:\bundle\vidalia\0.0.6\
+ C:\bundle\torbutton\1.0.4-fx+tb\
+
+5. Install Vidalia, Tor, and Privoxy to the directories you created for them
+in Step 4. Remember that you may need to grab the torrc.sample file from
+%APPDATA%\Tor that was created by Tor's installer and place it in the directory
+for the bundle's version of Tor. You may also need to grab
+%APPDATA%\Vidalia\geoip-cache, or a geoip-cache from Vidalia's source
+repository, and place it in the directory for the bundle's version of
+Vidalia.
+
+6. Place the Torbutton Firefox extension (.xpi) in the directory you created
+for it in Step 4.
+
+7. Modify Privoxy's config.txt file as follows:
+
+ * Add "forward-socks4a / localhost:9050 ." (without quotes) to the top
+ * Comment out "logfile privoxy.log" in Section 1.5
+ * Comment out "jarfile jar.log" in Section 1.6
+ * Uncomment "log-messages 1" in Section 6 and change the '1' to a '0'
+
+8. Run the vidalia-bundle.nsi script. The bundle will be named according the
+the versions you specified in Step 4 and placed in the base directory created
+in Step 1.
+
+--------------------------------------------------------------------------------
+
+For each additional release of some component of the bundle, follow Steps 4-8.
+If the version of some component didn't change, you can skip its step. For
+example, if the version of Privoxy didn't change then you can skip Step 7.
+
Deleted: releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi 2006-12-17 04:13:16 UTC (rev 1539)
+++ releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi 2006-12-26 02:02:23 UTC (rev 1559)
@@ -1,469 +0,0 @@
-;---------------------------------
-; $Id: $
-;
-; Vidalia/Tor/Privoxy Bundle Installer
-; See BUNDLE_LICENSE for licensing information
-;---------------------------------
-!include "MUI.nsh"
-
-SetCompressor /SOLID lzma
-!packhdr header.dat "upx --best header.dat"
-
-;---------------------------------
-; Global definitions
-!define SF_SELECTED 1
-!define SECTION_OFF 0xFFFFFFFE
-
-!define VIDALIA_NAME "Vidalia"
-!define VIDALIA_EXEC "vidalia.exe"
-!define VIDALIA_APPVERSION "0.0.10"
-!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
-!define VIDALIA_UNINST "uninstall.exe"
-
-!define TOR_NAME "Tor"
-!define TOR_EXEC "tor.exe"
-!define TOR_APPVERSION "0.1.2.4-alpha"
-!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
-!define TOR_UNINST "Uninstall.exe"
-
-!define PRIVOXY_NAME "Privoxy"
-!define PRIVOXY_EXEC "privoxy.exe"
-!define PRIVOXY_APPVERSION "3.0.6"
-!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
-!define PRIVOXY_UNINST "privoxy_uninstall.exe"
-
-!define TORBUTTON_NAME "Torbutton"
-!define TORBUTTON_APPVERSION "1.0.4-fx+tb"
-!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
-
-!define OPENSSL_NAME "OpenSSL"
-!define OPENSSL_APPVERSION "0.9.8d"
-!define OPENSSL_DESC "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
-
-!define BUNDLE_NAME "Vidalia Bundle"
-!define BUNDLE_APPVERSION "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
-!define BUNDLE_REVISION "1"
-!define BUNDLE_PRODVERSION "${VIDALIA_APPVERSION}.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
-!define BUNDLE_DESC "${BUNDLE_NAME} ${BUNDLE_APPVERSION}"
-!define INSTALLFILE "vidalia-bundle-${BUNDLE_APPVERSION}.exe"
-
-;--------------------------------
-; Installer file details
-VIAddVersionKey "ProductName" "${BUNDLE_NAME}"
-VIAddVersionKey "Comments" "${BUNDLE_DESC}"
-VIAddVersionKey "FileVersion" "${BUNDLE_APPVERSION}"
-VIAddVersionKey "FileDescription" "${BUNDLE_DESC}"
-VIProductVersion "${BUNDLE_PRODVERSION}"
-
-;--------------------------------
-; Basic installer information
-Name "${BUNDLE_NAME}"
-Caption "$(BundleSetupCaption)"
-BrandingText "${BUNDLE_DESC} (Rev. ${BUNDLE_REVISION})"
-OutFile "${INSTALLFILE}"
-InstallDir "$PROGRAMFILES"
-SetOverWrite ifnewer
-AutoCloseWindow false
-ShowInstDetails show
-CRCCheck on
-XPStyle on
-
-;--------------------------------
-; MUI Options
-!define MUI_WELCOMEPAGE_TITLE "$(BundleWelcomeTitle)"
-!define MUI_WELCOMEPAGE_TEXT "$(BundleWelcomeText)"
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_FINISHPAGE_TEXT "$(BundleFinishText)"
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
-!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)"
-!define MUI_FINISHPAGE_LINK "$(BundleLinkText)"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://tor.eff.org/docs/tor-doc-win32.html";
-
-;--------------------------------
-; Pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-
-;--------------------------------
-; Available languages
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "Farsi"
-!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-!insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "SimpChinese"
-!include "vidalia_en.nsh"
-!include "vidalia_de.nsh"
-!include "vidalia_es.nsh"
-!include "vidalia_fa.nsh"
-!include "vidalia_fi.nsh"
-!include "vidalia_fr.nsh"
-!include "vidalia_pl.nsh"
-!include "vidalia_pt-br.nsh"
-!include "vidalia_ru.nsh"
-!include "vidalia_zh-cn.nsh"
-
-;--------------------------------
-; Install types
-!ifndef NOINSTTYPES ; only if not defined
- InstType "Full"
- InstType "Base"
- ;InstType /COMPONENTSONLYONCUSTOM
-!endif
-
-
-
-;--------------------------------
-; Tor
-Var configdir
-Var configfile
-var bInstallTor
-SectionGroup "!${TOR_DESC}" TorGroup
- ;--------------------------------
- ; Tor application binaries
- Section "${TOR_NAME}" Tor
- ;Files that have to be installed for tor to run and that the user
- ;cannot choose not to install
- SectionIn 1 2
- SetOutPath "$INSTDIR\Tor"
- File "tor\${TOR_APPVERSION}\tor.exe"
- File "tor\${TOR_APPVERSION}\tor-resolve.exe"
- File "tor\${TOR_APPVERSION}\${TOR_UNINST}"
- WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org";
-
- StrCpy $configfile "torrc"
- StrCpy $configdir $APPDATA\Tor
- SetOutPath $configdir
-
- ;If there's already a torrc config file, ask if they want to
- ;overwrite it with the new one.
- IfFileExists "$configdir\torrc" "" endiftorrc
- MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO yesreplace
- Delete $configdir\torrc
- Goto endiftorrc
- yesreplace:
- StrCpy $configfile "torrc.sample"
- endiftorrc:
- File /oname=$configfile "tor\${TOR_APPVERSION}\torrc.sample"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "UninstallString" '"$INSTDIR\Tor\${TOR_UNINST}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoRepair" 1
-
- IntOp $bInstallTor 0 + 1
- SectionEnd
-
- ;--------------------------------
- ; OpenSSL binaries
- Section "$(TorOpenSSL)" TorOpenSSL
- SectionIn 1 2
- SetOutPath "$INSTDIR\Tor"
- File "tor\${TOR_APPVERSION}\libcrypto.a"
- File "tor\${TOR_APPVERSION}\libssl.a"
- SectionEnd
-
- ;--------------------------------
- ; Tor documentation
- Section "$(TorDocumentation)" TorDocs
- SectionIn 1
- SetOutPath "$INSTDIR\Tor\Documents"
- File "tor\${TOR_APPVERSION}\Documents\*.*"
- SectionEnd
-
- ;--------------------------------
- ; Tor Start menu shortcuts
- Section "$(TorShortcuts)" TorShortcuts
- SectionIn 1
- SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- SetOutPath "$INSTDIR\Tor"
- IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2
- RMDir /r "$SMPROGRAMS\Tor"
-
- CreateDirectory "$SMPROGRAMS\Tor"
- CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\Tor\tor.exe"
- CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
- CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor\Tor Website.url"
- CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Tor\${TOR_UNINST}"
-
- IfFileExists "$INSTDIR\Tor\Documents\*.*" "" endifdocs
- CreateDirectory "$SMPROGRAMS\Tor\Documents"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Tor\Documents\tor-reference.html"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Tor\Documents"
- CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Tor\Documents\tor-spec.txt"
- endifdocs:
- SectionEnd
-SectionGroupEnd
-
-
-;--------------------------------
-; Vidalia
-var bInstallVidalia
-SectionGroup "${VIDALIA_DESC}" VidaliaGroup
- ;--------------------------------
- ; Vidalia application binaries
- Section "${VIDALIA_NAME}" Vidalia
- SectionIn 1 2
-
- ; Set output path to the installation directory.
- SetOutPath "$INSTDIR\Vidalia"
- File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_EXEC}"
- File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_UNINST}"
- File "Vidalia\${VIDALIA_APPVERSION}\mingwm10.dll"
- File "Vidalia\${VIDALIA_APPVERSION}\README"
- File "Vidalia\${VIDALIA_APPVERSION}\CHANGELOG"
- File "Vidalia\${VIDALIA_APPVERSION}\LICENSE"
- File "Vidalia\${VIDALIA_APPVERSION}\COPYING"
- File "Vidalia\${VIDALIA_APPVERSION}\AUTHORS"
- File "BUNDLE_LICENSE"
-
- ; Tor gets installed to $INSTDIR\Tor, so let's remember it
- ; But first, we have to replace all the '\'s with '\\'s in the $INSTDIR
- ; Does NSIS make this easy by providing the ability to replace substrings? No.
- Push $INSTDIR
- Push "\"
- Push "\\"
- Call StrRep
- Pop $R0 ; contains the modified version of $INSTDIR
-
- SetShellVarContext current
- IfFileExists "$APPDATA\Vidalia" EndIfConf
- CreateDirectory "$APPDATA\Vidalia"
- EndIfConf:
- WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
- SetShellVarContext all
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\Vidalia\${VIDALIA_UNINST}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoRepair" 1
-
- IntOp $bInstallVidalia 0 + 1
- SectionEnd
-
- ;--------------------------------
- ; Vidalia Start menu shortcuts
- Section "$(VidaliaShortcuts)" VidaliaShortcuts
- SectionIn 1
- SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- CreateDirectory "$SMPROGRAMS\Vidalia"
- CreateShortCut "$SMPROGRAMS\Vidalia\Uninstall.lnk" "$INSTDIR\Vidalia\uninstall.exe" "" "$INSTDIR\Vidalia\${VIDALIA_UNINST}" 0
- CreateShortCut "$SMPROGRAMS\Vidalia\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
- SectionEnd
-
- ;--------------------------------
- ; Run Vidalia at startup
- Section "$(VidaliaStartup)" VidaliaStartup
- SectionIn 1
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- SectionEnd
-SectionGroupEnd
-
-
-;--------------------------------
-; Privoxy
-var bInstallPrivoxy
-SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
- ;--------------------------------
- ; Privoxy application binaries
- Section "${PRIVOXY_NAME}" Privoxy
- SectionIn 1 2
- ; add files / whatever that need to be installed here.
- SetOutPath "$INSTDIR\Privoxy"
- File /r Privoxy\${PRIVOXY_APPVERSION}\*.*
-
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
- WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
- WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
-
- ; Write the installation path into the registry
- WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\Privoxy\${PRIVOXY_UNINST}"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
-
-
- IntOp $bInstallPrivoxy 0 + 1
- SectionEnd
-
- ;--------------------------------
- ; Privoxy Start menu shortcuts
- Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
- SectionIn 1
- SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
- RMDir /r "$SMPROGRAMS\Privoxy"
- CreateDirectory "$SMPROGRAMS\Privoxy"
- CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
- WriteINIStr "$SMPROGRAMS\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
- CreateShortCut "$SMPROGRAMS\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
- CreateDirectory "$SMPROGRAMS\Privoxy\Edit Config"
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
- CreateDirectory "$SMPROGRAMS\Privoxy\Documentation"
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
- CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
- WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
- CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy Uninstall.lnk" "$INSTDIR\Privoxy\${PRIVOXY_UNINST}"
- SectionEnd
-
- ;--------------------------------
- ; Run Privoxy at startup
- Section "$(PrivoxyStartup)" PrivoxyStartup
- SectionIn 1
- CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
- SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-; Torbutton
-SectionGroup "${TORBUTTON_DESC}" TorbuttonGroup
- Section "${TORBUTTON_NAME}" Torbutton
- SectionIn 1 2
- SetOutPath "$INSTDIR\Torbutton"
- File torbutton\${TORBUTTON_APPVERSION}\torbutton-${TORBUTTON_APPVERSION}.xpi
- SectionEnd
-
- Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
- SectionIn 1 2
- ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
- StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
- Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
- Goto TorbuttonInstalled
- FirefoxNotFound:
- MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"
- TorbuttonInstalled:
- SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-; Functions
-Function .onInit
- !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-Function .onSelChange
- Push $0
-
- ; Check if the Torbutton option was unchecked
- SectionGetFlags ${Torbutton} $0
- IntOp $0 $0 & ${SF_SELECTED}
- IntCmp $0 0 0 SelChangeDone SelChangeDone
-
- ; Uncheck the "Add to Firefox" box
- SectionGetFlags ${TorbuttonAddToFirefox} $0
- IntOp $0 $0 & ${SECTION_OFF}
- SectionSetFlags ${TorbuttonAddToFirefox} $0
-
- SelChangeDone:
- Pop $0
-FunctionEnd
-
-Function CustomFinishFn
- IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
- run_vidalia:
- Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
- goto check_privoxy
-
- check_tor:
- IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
- run_tor:
- Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
-
- check_privoxy:
- IntCmp $bInstallPrivoxy 1 run_privoxy done done
- run_privoxy:
- SetOutPath "$INSTDIR\Privoxy"
- Exec '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"'
- done:
-FunctionEnd
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "$(TorAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "$(TorGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorOpenSSL} "$(TorOpenSSLDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "$(TorDocumentationDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorShortcuts} "$(TorShortcutsDesc)"
-
- !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaGroup} "$(VidaliaGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
-
- !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
-
- !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-Function StrRep
-
- ;Written by dirtydingus 2003-02-20 04:30:09
- ; USAGE
- ;Push String to do replacement in (haystack)
- ;Push String to replace (needle)
- ;Push Replacement
- ;Call StrRep
- ;Pop $R0 result
-
- Exch $R4 ; $R4 = Replacement String
- Exch
- Exch $R3 ; $R3 = String to replace (needle)
- Exch 2
- Exch $R1 ; $R1 = String to do replacement in (haystack)
- Push $R2 ; Replaced haystack
- Push $R5 ; Len (needle)
- Push $R6 ; len (haystack)
- Push $R7 ; Scratch reg
- StrCpy $R2 ""
- StrLen $R5 $R3
- StrLen $R6 $R1
-loop:
- StrCpy $R7 $R1 $R5
- StrCmp $R7 $R3 found
- StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
- StrCpy $R2 "$R2$R7"
- StrCpy $R1 $R1 $R6 1
- StrCmp $R1 "" done loop
-found:
- StrCpy $R2 "$R2$R4"
- StrCpy $R1 $R1 $R6 $R5
- StrCmp $R1 "" done loop
-done:
- StrCpy $R3 $R2
- Pop $R7
- Pop $R6
- Pop $R5
- Pop $R2
- Pop $R1
- Pop $R4
- Exch $R3
-
-FunctionEnd
-
Copied: releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi (from rev 1553, trunk/pkg/win32/vidalia-bundle.nsi)
===================================================================
--- releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi (rev 0)
+++ releases/vidalia-0.0.10/pkg/win32/vidalia-bundle.nsi 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,473 @@
+;---------------------------------
+; $Id: $
+;
+; Vidalia/Tor/Privoxy Bundle Installer
+; See BUNDLE_LICENSE for licensing information
+;---------------------------------
+!include "MUI.nsh"
+
+SetCompressor /SOLID lzma
+!packhdr header.dat "upx --best header.dat"
+
+;---------------------------------
+; Global definitions
+!define SF_SELECTED 1
+!define SECTION_OFF 0xFFFFFFFE
+
+!define VIDALIA_NAME "Vidalia"
+!define VIDALIA_EXEC "vidalia.exe"
+!define VIDALIA_APPVERSION "0.0.10"
+!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
+!define VIDALIA_UNINST "uninstall.exe"
+
+!define TOR_NAME "Tor"
+!define TOR_EXEC "tor.exe"
+!define TOR_APPVERSION "0.1.2.4-alpha"
+!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
+!define TOR_UNINST "Uninstall.exe"
+
+!define PRIVOXY_NAME "Privoxy"
+!define PRIVOXY_EXEC "privoxy.exe"
+!define PRIVOXY_APPVERSION "3.0.6"
+!define PRIVOXY_DESC "${PRIVOXY_NAME} ${PRIVOXY_APPVERSION}"
+!define PRIVOXY_UNINST "privoxy_uninstall.exe"
+
+!define TORBUTTON_NAME "Torbutton"
+!define TORBUTTON_APPVERSION "1.0.4-fx+tb"
+!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
+
+!define OPENSSL_NAME "OpenSSL"
+!define OPENSSL_APPVERSION "0.9.8d"
+!define OPENSSL_DESC "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
+
+!define BUNDLE_NAME "Vidalia Bundle"
+!define BUNDLE_APPVERSION "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
+!define BUNDLE_REVISION "1"
+!define BUNDLE_PRODVERSION "${VIDALIA_APPVERSION}.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
+!define BUNDLE_DESC "${BUNDLE_NAME} ${BUNDLE_APPVERSION}"
+!define INSTALLFILE "vidalia-bundle-${BUNDLE_APPVERSION}.exe"
+
+;--------------------------------
+; Installer file details
+VIAddVersionKey "ProductName" "${BUNDLE_NAME}"
+VIAddVersionKey "Comments" "${BUNDLE_DESC}"
+VIAddVersionKey "FileVersion" "${BUNDLE_APPVERSION}"
+VIAddVersionKey "FileDescription" "${BUNDLE_DESC}"
+VIProductVersion "${BUNDLE_PRODVERSION}"
+
+;--------------------------------
+; Basic installer information
+Name "${BUNDLE_NAME}"
+Caption "$(BundleSetupCaption)"
+BrandingText "${BUNDLE_DESC} (Rev. ${BUNDLE_REVISION})"
+OutFile "${INSTALLFILE}"
+InstallDir "$PROGRAMFILES"
+SetOverWrite ifnewer
+AutoCloseWindow false
+ShowInstDetails show
+CRCCheck on
+XPStyle on
+
+;--------------------------------
+; MUI Options
+!define MUI_WELCOMEPAGE_TITLE "$(BundleWelcomeTitle)"
+!define MUI_WELCOMEPAGE_TEXT "$(BundleWelcomeText)"
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_FINISHPAGE_TEXT "$(BundleFinishText)"
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
+!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)"
+!define MUI_FINISHPAGE_LINK "$(BundleLinkText)"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://tor.eff.org/docs/tor-doc-win32.html";
+
+;--------------------------------
+; Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+;--------------------------------
+; Available languages
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!include "vidalia_en.nsh"
+!include "vidalia_de.nsh"
+!include "vidalia_es.nsh"
+!include "vidalia_fa.nsh"
+!include "vidalia_fi.nsh"
+!include "vidalia_fr.nsh"
+!include "vidalia_pl.nsh"
+!include "vidalia_pt-br.nsh"
+!include "vidalia_ru.nsh"
+!include "vidalia_zh-cn.nsh"
+
+;--------------------------------
+; Install types
+!ifndef NOINSTTYPES ; only if not defined
+ InstType "Full"
+ InstType "Base"
+ ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+
+
+;--------------------------------
+; Tor
+Var configdir
+Var configfile
+var bInstallTor
+SectionGroup "!${TOR_DESC}" TorGroup
+ ;--------------------------------
+ ; Tor application binaries
+ Section "${TOR_NAME}" Tor
+ ;Files that have to be installed for tor to run and that the user
+ ;cannot choose not to install
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Tor"
+ File "tor\${TOR_APPVERSION}\tor.exe"
+ File "tor\${TOR_APPVERSION}\tor-resolve.exe"
+ File "tor\${TOR_APPVERSION}\${TOR_UNINST}"
+ WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org";
+
+ StrCpy $configfile "torrc"
+ StrCpy $configdir $APPDATA\Tor
+ SetOutPath $configdir
+
+ ;If there's already a torrc config file, ask if they want to
+ ;overwrite it with the new one.
+ IfFileExists "$configdir\torrc" "" endiftorrc
+ MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO yesreplace
+ Delete $configdir\torrc
+ Goto endiftorrc
+ yesreplace:
+ StrCpy $configfile "torrc.sample"
+ endiftorrc:
+ File /oname=$configfile "tor\${TOR_APPVERSION}\torrc.sample"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "UninstallString" '"$INSTDIR\Tor\${TOR_UNINST}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoRepair" 1
+
+ IntOp $bInstallTor 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; OpenSSL binaries
+ Section "$(TorOpenSSL)" TorOpenSSL
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Tor"
+ File "tor\${TOR_APPVERSION}\libcrypto.a"
+ File "tor\${TOR_APPVERSION}\libssl.a"
+ SectionEnd
+
+ ;--------------------------------
+ ; Tor documentation
+ Section "$(TorDocumentation)" TorDocs
+ SectionIn 1
+ SetOutPath "$INSTDIR\Tor\Documents"
+ File "tor\${TOR_APPVERSION}\Documents\*.*"
+ SectionEnd
+
+ ;--------------------------------
+ ; Tor Start menu shortcuts
+ Section "$(TorShortcuts)" TorShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ SetOutPath "$INSTDIR\Tor"
+ IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2
+ RMDir /r "$SMPROGRAMS\Tor"
+
+ CreateDirectory "$SMPROGRAMS\Tor"
+ CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\Tor\tor.exe"
+ CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
+ CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor\Tor Website.url"
+ CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Tor\${TOR_UNINST}"
+
+ IfFileExists "$INSTDIR\Tor\Documents\*.*" "" endifdocs
+ CreateDirectory "$SMPROGRAMS\Tor\Documents"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Tor\Documents\tor-reference.html"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Tor\Documents"
+ CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Tor\Documents\tor-spec.txt"
+ endifdocs:
+ SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Vidalia
+var bInstallVidalia
+SectionGroup "${VIDALIA_DESC}" VidaliaGroup
+ ;--------------------------------
+ ; Vidalia application binaries
+ Section "${VIDALIA_NAME}" Vidalia
+ SectionIn 1 2
+
+ ; Set output path to the installation directory.
+ SetOutPath "$INSTDIR\Vidalia"
+ File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_EXEC}"
+ File "Vidalia\${VIDALIA_APPVERSION}\${VIDALIA_UNINST}"
+ File "Vidalia\${VIDALIA_APPVERSION}\mingwm10.dll"
+ File "Vidalia\${VIDALIA_APPVERSION}\README"
+ File "Vidalia\${VIDALIA_APPVERSION}\CHANGELOG"
+ File "Vidalia\${VIDALIA_APPVERSION}\LICENSE"
+ File "Vidalia\${VIDALIA_APPVERSION}\COPYING"
+ File "Vidalia\${VIDALIA_APPVERSION}\AUTHORS"
+ File "BUNDLE_LICENSE"
+
+ ; Include a prebuilt GeoIP cache
+ SetOutPath "$APPDATA\Vidalia"
+ File "Vidalia\${VIDALIA_APPVERSION}\geoip-cache"
+
+ ; Tor gets installed to $INSTDIR\Tor, so let's remember it
+ ; But first, we have to replace all the '\'s with '\\'s in the $INSTDIR
+ ; Does NSIS make this easy by providing the ability to replace substrings? No.
+ Push $INSTDIR
+ Push "\"
+ Push "\\"
+ Call StrRep
+ Pop $R0 ; contains the modified version of $INSTDIR
+
+ SetShellVarContext current
+ IfFileExists "$APPDATA\Vidalia" EndIfConf
+ CreateDirectory "$APPDATA\Vidalia"
+ EndIfConf:
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
+ SetShellVarContext all
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\Vidalia\${VIDALIA_UNINST}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoRepair" 1
+
+ IntOp $bInstallVidalia 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Vidalia Start menu shortcuts
+ Section "$(VidaliaShortcuts)" VidaliaShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ CreateDirectory "$SMPROGRAMS\Vidalia"
+ CreateShortCut "$SMPROGRAMS\Vidalia\Uninstall.lnk" "$INSTDIR\Vidalia\uninstall.exe" "" "$INSTDIR\Vidalia\${VIDALIA_UNINST}" 0
+ CreateShortCut "$SMPROGRAMS\Vidalia\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
+ SectionEnd
+
+ ;--------------------------------
+ ; Run Vidalia at startup
+ Section "$(VidaliaStartup)" VidaliaStartup
+ SectionIn 1
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+ SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Privoxy
+var bInstallPrivoxy
+SectionGroup "${PRIVOXY_DESC}" PrivoxyGroup
+ ;--------------------------------
+ ; Privoxy application binaries
+ Section "${PRIVOXY_NAME}" Privoxy
+ SectionIn 1 2
+ ; add files / whatever that need to be installed here.
+ SetOutPath "$INSTDIR\Privoxy"
+ File /r Privoxy\${PRIVOXY_APPVERSION}\*.*
+
+ WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
+ WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
+ WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
+ WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
+
+ ; Write the installation path into the registry
+ WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\Privoxy\${PRIVOXY_UNINST}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
+
+
+ IntOp $bInstallPrivoxy 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Privoxy Start menu shortcuts
+ Section "$(PrivoxyShortcuts)" PrivoxyShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ RMDir /r "$SMPROGRAMS\Privoxy"
+ CreateDirectory "$SMPROGRAMS\Privoxy"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
+ WriteINIStr "$SMPROGRAMS\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
+ CreateShortCut "$SMPROGRAMS\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
+ CreateDirectory "$SMPROGRAMS\Privoxy\Edit Config"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
+ CreateDirectory "$SMPROGRAMS\Privoxy\Documentation"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
+ CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
+ WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
+ CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy Uninstall.lnk" "$INSTDIR\Privoxy\${PRIVOXY_UNINST}"
+ SectionEnd
+
+ ;--------------------------------
+ ; Run Privoxy at startup
+ Section "$(PrivoxyStartup)" PrivoxyStartup
+ SectionIn 1
+ CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
+ SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+; Torbutton
+SectionGroup "${TORBUTTON_DESC}" TorbuttonGroup
+ Section "${TORBUTTON_NAME}" Torbutton
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Torbutton"
+ File torbutton\${TORBUTTON_APPVERSION}\torbutton-${TORBUTTON_APPVERSION}.xpi
+ SectionEnd
+
+ Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
+ SectionIn 1 2
+ ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
+ StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
+ Exec '"$1firefox.exe" -install-global-extension "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
+ Goto TorbuttonInstalled
+ FirefoxNotFound:
+ MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"
+ TorbuttonInstalled:
+ SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+; Functions
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Function .onSelChange
+ Push $0
+
+ ; Check if the Torbutton option was unchecked
+ SectionGetFlags ${Torbutton} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 0 0 SelChangeDone SelChangeDone
+
+ ; Uncheck the "Add to Firefox" box
+ SectionGetFlags ${TorbuttonAddToFirefox} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${TorbuttonAddToFirefox} $0
+
+ SelChangeDone:
+ Pop $0
+FunctionEnd
+
+Function CustomFinishFn
+ IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
+ run_vidalia:
+ Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+ goto check_privoxy
+
+ check_tor:
+ IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
+ run_tor:
+ Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
+
+ check_privoxy:
+ IntCmp $bInstallPrivoxy 1 run_privoxy done done
+ run_privoxy:
+ SetOutPath "$INSTDIR\Privoxy"
+ Exec '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"'
+ done:
+FunctionEnd
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "$(TorAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "$(TorGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorOpenSSL} "$(TorOpenSSLDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "$(TorDocumentationDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorShortcuts} "$(TorShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaGroup} "$(VidaliaGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "$(PrivoxyAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "$(PrivoxyGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartup} "$(PrivoxyStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyShortcuts} "$(PrivoxyShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Function StrRep
+
+ ;Written by dirtydingus 2003-02-20 04:30:09
+ ; USAGE
+ ;Push String to do replacement in (haystack)
+ ;Push String to replace (needle)
+ ;Push Replacement
+ ;Call StrRep
+ ;Pop $R0 result
+
+ Exch $R4 ; $R4 = Replacement String
+ Exch
+ Exch $R3 ; $R3 = String to replace (needle)
+ Exch 2
+ Exch $R1 ; $R1 = String to do replacement in (haystack)
+ Push $R2 ; Replaced haystack
+ Push $R5 ; Len (needle)
+ Push $R6 ; len (haystack)
+ Push $R7 ; Scratch reg
+ StrCpy $R2 ""
+ StrLen $R5 $R3
+ StrLen $R6 $R1
+loop:
+ StrCpy $R7 $R1 $R5
+ StrCmp $R7 $R3 found
+ StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
+ StrCpy $R2 "$R2$R7"
+ StrCpy $R1 $R1 $R6 1
+ StrCmp $R1 "" done loop
+found:
+ StrCpy $R2 "$R2$R4"
+ StrCpy $R1 $R1 $R6 $R5
+ StrCmp $R1 "" done loop
+done:
+ StrCpy $R3 $R2
+ Pop $R7
+ Pop $R6
+ Pop $R5
+ Pop $R2
+ Pop $R1
+ Pop $R4
+ Exch $R3
+
+FunctionEnd
+
Deleted: releases/vidalia-0.0.10/pkg/win32/vidalia.nsi
===================================================================
--- trunk/pkg/win32/vidalia.nsi 2006-12-17 04:13:16 UTC (rev 1539)
+++ releases/vidalia-0.0.10/pkg/win32/vidalia.nsi 2006-12-26 02:02:23 UTC (rev 1559)
@@ -1,182 +0,0 @@
-;-------------------------------------------
-; $Id: $
-;
-; Copyright (c) 2006, Matt Edman, Justin Hipple
-; See LICENSE for licensing information
-;-------------------------------------------
-!include "MUI.nsh"
-
-SetCompressor /SOLID lzma
-!packhdr header.dat "upx --best header.dat"
-
-;---------------------------------
-; Global definitions
-!define VIDALIA_NAME "Vidalia"
-!define VIDALIA_EXEC "vidalia.exe"
-!define VIDALIA_APPVERSION "0.0.10"
-!define VIDALIA_PRODVERSION "${VIDALIA_APPVERSION}.0" ; Product version must be x.x.x.x
-!define VIDALIA_AUTHORS "Matt Edman, Justin Hipple"
-!define VIDALIA_INSTALLFILE "vidalia-${VIDALIA_APPVERSION}.exe"
-!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
-
-;--------------------------------
-; Installer file details
-VIAddVersionKey "ProductName" "${VIDALIA_NAME}"
-VIAddVersionKey "Comments" "${VIDALIA_DESC}"
-VIAddVersionKey "CompanyName" "${VIDALIA_AUTHORS}"
-VIAddVersionKey "LegalTrademarks" "${VIDALIA_AUTHORS}"
-VIAddVersionKey "LegalCopyright" "${VIDALIA_AUTHORS}"
-VIAddVersionKey "FileVersion" "${VIDALIA_APPVERSION}"
-VIAddVersionKey "FileDescription" "${VIDALIA_DESC}"
-VIProductVersion "${VIDALIA_PRODVERSION}"
-
-;--------------------------------
-; Basic installer information
-Name "${VIDALIA_NAME}"
-Caption "$(VidaliaSetupCaption)"
-BrandingText "${VIDALIA_DESC}"
-OutFile "${VIDALIA_INSTALLFILE}"
-InstallDir "$PROGRAMFILES\${VIDALIA_NAME}"
-InstallDirRegKey HKCU "Software" "${VIDALIA_NAME}"
-SetOverWrite ifnewer
-AutoCloseWindow false
-ShowInstDetails show
-CRCCheck on
-XPStyle on
-
-;--------------------------------
-; Install types
-!ifndef NOINSTTYPES ; only if not defined
- InstType "Full"
- InstType "Base"
- ;InstType /COMPONENTSONLYONCUSTOM
-!endif
-
-;--------------------------------
-; MUI Options
-!define MUI_WELCOMEPAGE_TITLE "$(VidaliaWelcomeTitle)"
-!define MUI_WELCOMEPAGE_TEXT "$(VidaliaWelcomeText)"
-!define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${VIDALIA_EXEC}"
-!define MUI_FINISHPAGE_RUN_TEXT "$(VidaliaRunNow)"
-!define MUI_FINISHPAGE_LINK "$(VidaliaLinkText)"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.vidalia-project.net";
-
-;--------------------------------
-; Pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-!insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-; Available languages
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "Farsi"
-!insertmacro MUI_LANGUAGE "Finnish"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "Polish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-!insertmacro MUI_LANGUAGE "Russian"
-!insertmacro MUI_LANGUAGE "Spanish"
-!insertmacro MUI_LANGUAGE "SimpChinese"
-!include "vidalia_en.nsh"
-!include "vidalia_de.nsh"
-!include "vidalia_es.nsh"
-!include "vidalia_fa.nsh"
-!include "vidalia_fi.nsh"
-!include "vidalia_fr.nsh"
-!include "vidalia_pl.nsh"
-!include "vidalia_pt-br.nsh"
-!include "vidalia_ru.nsh"
-!include "vidalia_zh-cn.nsh"
-
-;--------------------------------
-; Functions
-Function .onInit
- !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-;--------------------------------
-; Required Components
-Section "${VIDALIA_DESC}" Vidalia
- SectionIn RO
-
- ; Set output path to the installation directory.
- SetOutPath $INSTDIR
- File "..\..\release\${VIDALIA_EXEC}"
- File "..\..\release\mingwm10.dll"
- File "..\..\AUTHORS"
- File "..\..\CHANGELOG"
- File "..\..\LICENSE"
- File "..\..\COPYING"
- File "..\..\README"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "DisplayName" "${VIDALIA_DESC}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoRepair" 1
- WriteUninstaller "uninstall.exe"
-SectionEnd
-
-;--------------------------------
-; Start Menu Shortcuts
-; Optional section (can be disabled by the user)
-Section "$(VidaliaShortcuts)" Shortcuts
- SectionIn 1
- SetShellVarContext all
- CreateDirectory "$SMPROGRAMS\${VIDALIA_NAME}"
- CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\${VIDALIA_NAME}.lnk" "$INSTDIR\${VIDALIA_EXEC}" "" "$INSTDIR\${VIDALIA_EXEC}" 0
- CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-SectionEnd
-
-;--------------------------------
-; Run At Startup
-Section "$(VidaliaStartup)" RunAtStartup
- SectionIn 1
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\${VIDALIA_EXEC}"'
-SectionEnd
-
-;--------------------------------
-; Uninstaller
-Section "Uninstall"
- SetShellVarContext all
-
- ; Remove registry keys
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run\" "${VIDALIA_NAME}"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}"
- DeleteRegKey HKCU "Software\${VIDALIA_NAME}"
-
- ; Remove files and uninstaller
- Delete $INSTDIR\uninstall.exe
-
- ; Remove shortcuts, if any
- Delete "$SMPROGRAMS\${VIDALIA_NAME}\*.*"
-
- ; Remove directories used
- RMDir "$SMPROGRAMS\${VIDALIA_NAME}"
- RMDir /r "$INSTDIR"
-
- SetShellVarContext current
- RMDir /r "$APPDATA\Vidalia"
-SectionEnd
-
-;--------------------------------
-; Descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${Shortcuts} "$(VidaliaShortcutsDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${RunAtStartup} "$(VidaliaStartupDesc)"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
Copied: releases/vidalia-0.0.10/pkg/win32/vidalia.nsi (from rev 1553, trunk/pkg/win32/vidalia.nsi)
===================================================================
--- releases/vidalia-0.0.10/pkg/win32/vidalia.nsi (rev 0)
+++ releases/vidalia-0.0.10/pkg/win32/vidalia.nsi 2006-12-26 02:02:23 UTC (rev 1559)
@@ -0,0 +1,186 @@
+;-------------------------------------------
+; $Id: $
+;
+; Copyright (c) 2006, Matt Edman, Justin Hipple
+; See LICENSE for licensing information
+;-------------------------------------------
+!include "MUI.nsh"
+
+SetCompressor /SOLID lzma
+!packhdr header.dat "upx --best header.dat"
+
+;---------------------------------
+; Global definitions
+!define VIDALIA_NAME "Vidalia"
+!define VIDALIA_EXEC "vidalia.exe"
+!define VIDALIA_APPVERSION "0.0.10"
+!define VIDALIA_PRODVERSION "${VIDALIA_APPVERSION}.0" ; Product version must be x.x.x.x
+!define VIDALIA_AUTHORS "Matt Edman, Justin Hipple"
+!define VIDALIA_INSTALLFILE "vidalia-${VIDALIA_APPVERSION}.exe"
+!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
+
+;--------------------------------
+; Installer file details
+VIAddVersionKey "ProductName" "${VIDALIA_NAME}"
+VIAddVersionKey "Comments" "${VIDALIA_DESC}"
+VIAddVersionKey "CompanyName" "${VIDALIA_AUTHORS}"
+VIAddVersionKey "LegalTrademarks" "${VIDALIA_AUTHORS}"
+VIAddVersionKey "LegalCopyright" "${VIDALIA_AUTHORS}"
+VIAddVersionKey "FileVersion" "${VIDALIA_APPVERSION}"
+VIAddVersionKey "FileDescription" "${VIDALIA_DESC}"
+VIProductVersion "${VIDALIA_PRODVERSION}"
+
+;--------------------------------
+; Basic installer information
+Name "${VIDALIA_NAME}"
+Caption "$(VidaliaSetupCaption)"
+BrandingText "${VIDALIA_DESC}"
+OutFile "${VIDALIA_INSTALLFILE}"
+InstallDir "$PROGRAMFILES\${VIDALIA_NAME}"
+InstallDirRegKey HKCU "Software" "${VIDALIA_NAME}"
+SetOverWrite ifnewer
+AutoCloseWindow false
+ShowInstDetails show
+CRCCheck on
+XPStyle on
+
+;--------------------------------
+; Install types
+!ifndef NOINSTTYPES ; only if not defined
+ InstType "Full"
+ InstType "Base"
+ ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+;--------------------------------
+; MUI Options
+!define MUI_WELCOMEPAGE_TITLE "$(VidaliaWelcomeTitle)"
+!define MUI_WELCOMEPAGE_TEXT "$(VidaliaWelcomeText)"
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${VIDALIA_EXEC}"
+!define MUI_FINISHPAGE_RUN_TEXT "$(VidaliaRunNow)"
+!define MUI_FINISHPAGE_LINK "$(VidaliaLinkText)"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.vidalia-project.net";
+
+;--------------------------------
+; Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+; Available languages
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!include "vidalia_en.nsh"
+!include "vidalia_de.nsh"
+!include "vidalia_es.nsh"
+!include "vidalia_fa.nsh"
+!include "vidalia_fi.nsh"
+!include "vidalia_fr.nsh"
+!include "vidalia_pl.nsh"
+!include "vidalia_pt-br.nsh"
+!include "vidalia_ru.nsh"
+!include "vidalia_zh-cn.nsh"
+
+;--------------------------------
+; Functions
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+;--------------------------------
+; Required Components
+Section "${VIDALIA_DESC}" Vidalia
+ SectionIn RO
+
+ ; Set output path to the installation directory.
+ SetOutPath $INSTDIR
+ File "..\..\release\${VIDALIA_EXEC}"
+ File "..\..\release\mingwm10.dll"
+ File "..\..\AUTHORS"
+ File "..\..\CHANGELOG"
+ File "..\..\LICENSE"
+ File "..\..\COPYING"
+ File "..\..\README"
+
+ ; Include a prebuilt GeoIP cache
+ SetOutPath "$APPDATA\Vidalia\geoip-cache"
+ File "..\geoip-cache"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "DisplayName" "${VIDALIA_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "NoRepair" 1
+ WriteUninstaller "uninstall.exe"
+SectionEnd
+
+;--------------------------------
+; Start Menu Shortcuts
+; Optional section (can be disabled by the user)
+Section "$(VidaliaShortcuts)" Shortcuts
+ SectionIn 1
+ SetShellVarContext all
+ CreateDirectory "$SMPROGRAMS\${VIDALIA_NAME}"
+ CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\${VIDALIA_NAME}.lnk" "$INSTDIR\${VIDALIA_EXEC}" "" "$INSTDIR\${VIDALIA_EXEC}" 0
+ CreateShortCut "$SMPROGRAMS\${VIDALIA_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+SectionEnd
+
+;--------------------------------
+; Run At Startup
+Section "$(VidaliaStartup)" RunAtStartup
+ SectionIn 1
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\${VIDALIA_EXEC}"'
+SectionEnd
+
+;--------------------------------
+; Uninstaller
+Section "Uninstall"
+ SetShellVarContext all
+
+ ; Remove registry keys
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run\" "${VIDALIA_NAME}"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}"
+ DeleteRegKey HKCU "Software\${VIDALIA_NAME}"
+
+ ; Remove files and uninstaller
+ Delete $INSTDIR\uninstall.exe
+
+ ; Remove shortcuts, if any
+ Delete "$SMPROGRAMS\${VIDALIA_NAME}\*.*"
+
+ ; Remove directories used
+ RMDir "$SMPROGRAMS\${VIDALIA_NAME}"
+ RMDir /r "$INSTDIR"
+
+ SetShellVarContext current
+ RMDir /r "$APPDATA\Vidalia"
+SectionEnd
+
+;--------------------------------
+; Descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${Shortcuts} "$(VidaliaShortcutsDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${RunAtStartup} "$(VidaliaStartupDesc)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
Copied: releases/vidalia-0.0.10/src (from rev 1558, trunk/src)
Modified: releases/vidalia-0.0.10/src/vidalia.h
===================================================================
--- trunk/src/vidalia.h 2006-12-26 00:57:56 UTC (rev 1558)
+++ releases/vidalia-0.0.10/src/vidalia.h 2006-12-26 02:02:23 UTC (rev 1559)
@@ -42,7 +42,7 @@
#include <control/torcontrol.h>
/** Vidalia's version string */
-#define VIDALIA_VERSION "0.0.10-svn"
+#define VIDALIA_VERSION "0.0.10"
/** Pointer to this Vidalia application instance. */
#define vApp ((Vidalia *)qApp)