- tor-commits - lists.torproject.org

[vidalia/alpha] Get the current progress at connect without waiting for events
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit 0786bf230ffc3db19a8087dd04b70e12e9db713d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:08:57 2012 -0300 Get the current progress at connect without waiting for events --- src/torcontrol/TorControl.cpp | 29 +++++++++++++++++++++++++++++ src/torcontrol/TorControl.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 433e1a9..5d31023 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -213,6 +213,33 @@ TorControl::disconnect() _controlConn->disconnect(); } +void +TorControl::getBootstrapPhase() +{ + ControlCommand cmd("GETINFO", "status/bootstrap-phase"); + ControlReply reply; + QString str; + + if (!send(cmd, reply, &str)) { + return; + } + + bool ok; + QHash<QString, QString> args; + args = string_parse_keyvals(reply.getMessage(), &ok); + + if(!ok) + return; + + tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); + BootstrapStatus status + = BootstrapStatus(severity, + BootstrapStatus::statusFromString(args.value("TAG")), + args.value("PROGRESS").toInt(), + args.value("SUMMARY")); + emit bootstrapStatusChanged(status); +} + /** Emits a signal that the control socket disconnected from Tor */ void TorControl::onDisconnected() @@ -313,6 +340,8 @@ TorControl::onAuthenticated() /* We want to use extended events in all async events */ useFeature("EXTENDED_EVENTS"); + getBootstrapPhase(); + emit authenticated(); } diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index 589fa23..f3504f5 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -401,6 +401,7 @@ private: /* The slots below simply relay signals from the appropriate member objects */ private slots: void onStopped(int exitCode, QProcess::ExitStatus exitStatus); + void getBootstrapPhase(); void onDisconnected(); void onLogStdout(const QString &severity, const QString &message); void onAuthenticated();

1 0

[vidalia/alpha] Add changes file
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit d5aeb20f49c5d340d50a3cf11a4d44a38c700bd5 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:14:28 2012 -0300 Add changes file --- changes/bug4827 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug4827 b/changes/bug4827 new file mode 100644 index 0000000..799a3dc --- /dev/null +++ b/changes/bug4827 @@ -0,0 +1,6 @@ + o When Tor has cached enough information it bootstraps faster than + what takes Vidalia connect to it, so Vidalia does not see the + event to update the progress bar. Now Vidalia explicitly asks for + bootstrap-phase when it connects to Tor, and updates the progress + to what is actually happening instead of hanging in + "Authenticating to Tor". Fixes bug 4827. \ No newline at end of file

1 0

[vidalia/master] Get the current progress at connect without waiting for events
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit 172c2f640f50f07d6f20ad5e3410c4fdb249ee2e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:08:57 2012 -0300 Get the current progress at connect without waiting for events --- src/torcontrol/TorControl.cpp | 29 +++++++++++++++++++++++++++++ src/torcontrol/TorControl.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 57abeb1..af925a7 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -209,6 +209,33 @@ TorControl::disconnect() _controlConn->disconnect(); } +void +TorControl::getBootstrapPhase() +{ + ControlCommand cmd("GETINFO", "status/bootstrap-phase"); + ControlReply reply; + QString str; + + if (!send(cmd, reply, &str)) { + return; + } + + bool ok; + QHash<QString, QString> args; + args = string_parse_keyvals(reply.getMessage(), &ok); + + if(!ok) + return; + + tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); + BootstrapStatus status + = BootstrapStatus(severity, + BootstrapStatus::statusFromString(args.value("TAG")), + args.value("PROGRESS").toInt(), + args.value("SUMMARY")); + emit bootstrapStatusChanged(status); +} + /** Emits a signal that the control socket disconnected from Tor */ void TorControl::onDisconnected() @@ -309,6 +336,8 @@ TorControl::onAuthenticated() /* We want to use extended events in all async events */ useFeature("EXTENDED_EVENTS"); + getBootstrapPhase(); + emit authenticated(); } diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index 589fa23..f3504f5 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -401,6 +401,7 @@ private: /* The slots below simply relay signals from the appropriate member objects */ private slots: void onStopped(int exitCode, QProcess::ExitStatus exitStatus); + void getBootstrapPhase(); void onDisconnected(); void onLogStdout(const QString &severity, const QString &message); void onAuthenticated();

1 0

[vidalia/master] Add changes file
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit ad697c4f99df426929f37ea475f645871c6421ee Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:14:28 2012 -0300 Add changes file --- changes/bug4827 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug4827 b/changes/bug4827 new file mode 100644 index 0000000..799a3dc --- /dev/null +++ b/changes/bug4827 @@ -0,0 +1,6 @@ + o When Tor has cached enough information it bootstraps faster than + what takes Vidalia connect to it, so Vidalia does not see the + event to update the progress bar. Now Vidalia explicitly asks for + bootstrap-phase when it connects to Tor, and updates the progress + to what is actually happening instead of hanging in + "Authenticating to Tor". Fixes bug 4827. \ No newline at end of file

1 0

[metrics-web/master] Restrict relay search to last four days first.
by karsten＠torproject.org 05 Jan '12

05 Jan '12

commit 444f874cf19fb10fc4364e037a2af09073e60f12 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 07:01:31 2012 +0100 Restrict relay search to last four days first. The idea is that most searches will find 31 matches in the last four days, a time that covers 96 consensuses. Only if the search returns less than 31 matches, we'll have to re-run the search for the last month. --- .../torproject/ernie/web/RelaySearchServlet.java | 144 +++++++++++--------- 1 files changed, 82 insertions(+), 62 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 05be5e8..82d223b 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -297,17 +297,15 @@ public class RelaySearchServlet extends HttpServlet { + "address LIKE '" + searchIPAddress + "%' "); addAnd = true; } - StringBuilder queryBuilder = new StringBuilder(); - queryBuilder.append("SELECT validafter, fingerprint, descriptor, " - + "rawdesc FROM statusentry WHERE validafter IN (SELECT " - + "validafter FROM statusentry WHERE "); - queryBuilder.append(conditionBuilder.toString()); + List<String> timeIntervals = new ArrayList<String>(); if (searchDayTimestamps.size() > 0 || searchMonthTimestamps.size() > 0) { + StringBuilder timeIntervalBuilder = new StringBuilder(); boolean addOr = false; - queryBuilder.append("AND ("); + timeIntervalBuilder.append("AND ("); for (long searchTimestamp : searchDayTimestamps) { - queryBuilder.append((addOr ? "OR " : "") + "(validafter >= '" + timeIntervalBuilder.append((addOr ? "OR " : "") + + "(validafter >= '" + dateTimeFormat.format(searchTimestamp) + "' AND " + "validafter < '" + dateTimeFormat.format(searchTimestamp + 24L * 60L * 60L * 1000L) + "') "); @@ -318,22 +316,35 @@ public class RelaySearchServlet extends HttpServlet { TimeZone.getTimeZone("UTC")); firstOfNextMonth.setTimeInMillis(searchTimestamp); firstOfNextMonth.add(Calendar.MONTH, 1); - queryBuilder.append((addOr ? "OR " : "") + "(validafter >= '" + timeIntervalBuilder.append((addOr ? "OR " : "") + + "(validafter >= '" + dateTimeFormat.format(searchTimestamp) + "' AND " + "validafter < '" + dateTimeFormat.format( firstOfNextMonth.getTimeInMillis()) + "') "); addOr = true; } - queryBuilder.append(") "); + timeIntervalBuilder.append(") "); + timeIntervals.add(timeIntervalBuilder.toString()); } else { - queryBuilder.append("AND validafter >= '" + dateTimeFormat.format( - System.currentTimeMillis() - 30L * 24L * 60L * 60L * 1000L) - + "' "); + timeIntervals.add("AND validafter >= '" + + dateTimeFormat.format(System.currentTimeMillis() + - 4L * 24L * 60L * 60L * 1000L) + "' "); + timeIntervals.add("AND validafter >= '" + + dateTimeFormat.format(System.currentTimeMillis() + - 30L * 24L * 60L * 60L * 1000L) + "' "); + } + List<String> queries = new ArrayList<String>(); + for (String timeInterval : timeIntervals) { + StringBuilder queryBuilder = new StringBuilder(); + queryBuilder.append("SELECT validafter, fingerprint, descriptor, " + + "rawdesc FROM statusentry WHERE validafter IN (SELECT " + + "validafter FROM statusentry WHERE "); + queryBuilder.append(conditionBuilder.toString()); + queryBuilder.append(timeInterval); + queryBuilder.append("ORDER BY validafter DESC LIMIT 31) AND "); + queryBuilder.append(conditionBuilder.toString()); + queries.add(queryBuilder.toString()); } - queryBuilder.append("ORDER BY validafter DESC LIMIT 31) AND "); - queryBuilder.append(conditionBuilder.toString()); - String query = queryBuilder.toString(); - request.setAttribute("query", query); /* Actually execute the query. */ long startedQuery = System.currentTimeMillis(); @@ -343,59 +354,67 @@ public class RelaySearchServlet extends HttpServlet { Map<String, String> rawValidAfterLines = new HashMap<String, String>(); Map<String, String> rawStatusEntries = new HashMap<String, String>(); + String query = null; int matches = 0; try { long requestedConnection = System.currentTimeMillis(); Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - while (rs.next()) { - matches++; - String validAfter = rs.getTimestamp(1).toString(). - substring(0, 19); - String fingerprint = rs.getString(2); - String descriptor = rs.getString(3); - if (!foundDescriptors.containsKey(validAfter)) { - foundDescriptors.put(validAfter, new TreeSet<String>()); - } - foundDescriptors.get(validAfter).add(validAfter + " " - + fingerprint); - if (!rawValidAfterLines.containsKey(validAfter)) { - rawValidAfterLines.put(validAfter, "<tt>valid-after " - + "<a href=\"consensus?valid-after=" - + validAfter.replaceAll(":", "-").replaceAll(" ", "-") - + "\" target=\"_blank\">" + validAfter + "</a></tt> "); - } - byte[] rawStatusEntry = rs.getBytes(4); - String statusEntryLines = null; - try { - statusEntryLines = new String(rawStatusEntry, "US-ASCII"); - } catch (UnsupportedEncodingException e) { - /* This shouldn't happen, because we know that ASCII is - * supported. */ - } - StringBuilder rawStatusEntryBuilder = new StringBuilder(); - String[] lines = statusEntryLines.split("\n"); - for (String line : lines) { - if (line.startsWith("r ")) { - String[] parts = line.split(" "); - String descriptorBase64 = String.format("%040x", - new BigInteger(1, Base64.decodeBase64(parts[3] - + "=="))); - rawStatusEntryBuilder.append("<tt>r " + parts[1] + " " - + parts[2] + " <a href=\"descriptor.html?desc-id=" - + descriptorBase64 + "\" target=\"_blank\">" + parts[3] - + "</a> " + parts[4] + " " + parts[5] + " " + parts[6] - + " " + parts[7] + " " + parts[8] + "</tt> "); - } else { - rawStatusEntryBuilder.append("<tt>" + line + "</tt> "); + while (!queries.isEmpty()) { + query = queries.remove(0); + this.logger.info("Running query '" + query + "'."); + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + while (rs.next()) { + matches++; + String validAfter = rs.getTimestamp(1).toString(). + substring(0, 19); + String fingerprint = rs.getString(2); + String descriptor = rs.getString(3); + if (!foundDescriptors.containsKey(validAfter)) { + foundDescriptors.put(validAfter, new TreeSet<String>()); + } + foundDescriptors.get(validAfter).add(validAfter + " " + + fingerprint); + if (!rawValidAfterLines.containsKey(validAfter)) { + rawValidAfterLines.put(validAfter, "<tt>valid-after " + + "<a href=\"consensus?valid-after=" + + validAfter.replaceAll(":", "-").replaceAll(" ", "-") + + "\" target=\"_blank\">" + validAfter + "</a></tt> "); } + byte[] rawStatusEntry = rs.getBytes(4); + String statusEntryLines = null; + try { + statusEntryLines = new String(rawStatusEntry, "US-ASCII"); + } catch (UnsupportedEncodingException e) { + /* This shouldn't happen, because we know that ASCII is + * supported. */ + } + StringBuilder rawStatusEntryBuilder = new StringBuilder(); + String[] lines = statusEntryLines.split("\n"); + for (String line : lines) { + if (line.startsWith("r ")) { + String[] parts = line.split(" "); + String descriptorBase64 = String.format("%040x", + new BigInteger(1, Base64.decodeBase64(parts[3] + + "=="))); + rawStatusEntryBuilder.append("<tt>r " + parts[1] + " " + + parts[2] + " <a href=\"descriptor.html?desc-id=" + + descriptorBase64 + "\" target=\"_blank\">" + parts[3] + + "</a> " + parts[4] + " " + parts[5] + " " + parts[6] + + " " + parts[7] + " " + parts[8] + "</tt> "); + } else { + rawStatusEntryBuilder.append("<tt>" + line + "</tt> "); + } + } + rawStatusEntries.put(validAfter + " " + fingerprint, + rawStatusEntryBuilder.toString()); + } + rs.close(); + statement.close(); + if (matches == 31) { + queries.clear(); } - rawStatusEntries.put(validAfter + " " + fingerprint, - rawStatusEntryBuilder.toString()); } - rs.close(); - statement.close(); conn.close(); this.logger.info("Returned a database connection to the pool " + "after " + (System.currentTimeMillis() @@ -407,6 +426,7 @@ public class RelaySearchServlet extends HttpServlet { "Database problem"); return; } + request.setAttribute("query", query); request.setAttribute("queryTime", System.currentTimeMillis() - startedQuery); request.setAttribute("foundDescriptors", foundDescriptors);

1 0

[torbrowser/maint-2.2] update recommended-versions for 2.2.35-4
by erinn＠torproject.org 05 Jan '12

05 Jan '12

commit 860d4e72ef182cc42f9d94e44945b72593a9c881 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 5 18:34:37 2012 +0100 update recommended-versions for 2.2.35-4 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 293d0b4..f1e681b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-3-Linux-i686", -"2.2.35-3-Linux-x86_64", -"2.2.35-3-MacOS-i386", -"2.2.35-3-MacOS-x86_64", -"2.2.35-3-Windows" +"2.2.35-4-Linux-i686", +"2.2.35-4-Linux-x86_64", +"2.2.35-4-MacOS-i386", +"2.2.35-4-MacOS-x86_64", +"2.2.35-4-Windows" ]

1 0

[torbrowser/maint-2.3] update recommended-versions for 2.2.35-4
by erinn＠torproject.org 05 Jan '12

05 Jan '12

commit 860d4e72ef182cc42f9d94e44945b72593a9c881 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 5 18:34:37 2012 +0100 update recommended-versions for 2.2.35-4 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 293d0b4..f1e681b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-3-Linux-i686", -"2.2.35-3-Linux-x86_64", -"2.2.35-3-MacOS-i386", -"2.2.35-3-MacOS-x86_64", -"2.2.35-3-Windows" +"2.2.35-4-Linux-i686", +"2.2.35-4-Linux-x86_64", +"2.2.35-4-MacOS-i386", +"2.2.35-4-MacOS-x86_64", +"2.2.35-4-Windows" ]

1 0

[torbrowser/master] update recommended-versions for 2.2.35-4
by erinn＠torproject.org 05 Jan '12

05 Jan '12

commit 860d4e72ef182cc42f9d94e44945b72593a9c881 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Jan 5 18:34:37 2012 +0100 update recommended-versions for 2.2.35-4 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 293d0b4..f1e681b 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-3-Linux-i686", -"2.2.35-3-Linux-x86_64", -"2.2.35-3-MacOS-i386", -"2.2.35-3-MacOS-x86_64", -"2.2.35-3-Windows" +"2.2.35-4-Linux-i686", +"2.2.35-4-Linux-x86_64", +"2.2.35-4-MacOS-i386", +"2.2.35-4-MacOS-x86_64", +"2.2.35-4-Windows" ]

1 0

[tor/master] Remove extraneous incorrect check for net/if.h
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 13b2aa659833b52a62123cd0b3dc48caa7ee1019 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 12:25:31 2012 -0500 Remove extraneous incorrect check for net/if.h Fixes bug 4829; bug not in any released tor. --- configure.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index c167b8d..f4a8e1e 100644 --- a/configure.in +++ b/configure.in @@ -635,7 +635,6 @@ AC_CHECK_HEADERS( malloc/malloc.h \ malloc_np.h \ netdb.h \ - net/if.h \ netinet/in.h \ netinet/in6.h \ pwd.h \

1 0

r25284: {website} bump all tor versions for new openssl version (website/trunk/include)
by Erinn Clark 05 Jan '12

05 Jan '12

Author: erinn Date: 2012-01-05 17:20:18 +0000 (Thu, 05 Jan 2012) New Revision: 25284 Modified: website/trunk/include/versions.wmi Log: bump all tor versions for new openssl version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-03 17:35:29 UTC (rev 25283) +++ website/trunk/include/versions.wmi 2012-01-05 17:20:18 UTC (rev 25284) @@ -27,9 +27,9 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0f</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>9.0.1</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -37,16 +37,16 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.16-stable, zlib-1.2.5, openssl-1.0.0f</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>9.0.1</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-3</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-4</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-4</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>9.0.1</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> @@ -60,36 +60,36 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>-FINAL.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.15.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.15-1.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> -<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.15.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.15-1.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.15.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.15-1.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.15.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.15-1.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.15.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.15-1.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.15.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.15-1.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.15.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.15-1.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.15.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.15-1.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.15-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.15-i386-1.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> -<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.15-i386.dmg</define-tag> +<define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.15-i386-1.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.15-ppc.dmg</define-tag> -<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.15-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.15-ppc-1.dmg</define-tag> +<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.15-ppc-1.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> <define-tag package-osx-x86-alpha whitespace=delete>../dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag>

1 0