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

[tor/release-0.2.1] Merge branch 'careful_with_all_descs' into maint-0.2.1
by arma＠torproject.org 11 May '11

11 May '11

commit 0f637492e30e19ad7abeedafdd58c087f01b4527 Merge: 8b01fd7 b231026 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:35:42 2011 -0500 Merge branch 'careful_with_all_descs' into maint-0.2.1 changes/all_descs | 4 ++++ src/or/dirserv.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.1] Oops, here's the *REAL* fix for the ipv6 issue
by arma＠torproject.org 11 May '11

11 May '11

commit 2ce132e335d60c7ef1d01aa00db5ab4c5b7d674f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:31:06 2011 -0500 Oops, here's the *REAL* fix for the ipv6 issue We need to _REJECT_ descriptors with accept6/reject6 lines. If we let them onto the network , other un-upgraded tors will crash. --- changes/ipv6_crash | 5 +++-- src/or/routerparse.c | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/ipv6_crash b/changes/ipv6_crash index 2b04355..02f8aaa 100644 --- a/changes/ipv6_crash +++ b/changes/ipv6_crash @@ -1,3 +1,4 @@ - o Major bugfixes (directory authority) + o Major bugfixes: - Fix a crash in parsing router descriptors containing IPv6 - addresses. Bugfix on 0.2.1.3-alpha. + addresses. This one crashed the directory authorities when somebody + fired up some experimental code. Bugfix on 0.2.1.3-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index aa0687d..1faa177 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1369,6 +1369,12 @@ router_parse_entry_from_string(const char *s, const char *end, router->has_old_dnsworkers = 1; } + if (find_opt_by_keyword(tokens, K_REJECT6) || + find_opt_by_keyword(tokens, K_ACCEPT6)) { + log_warn(LD_DIR, "Rejecting router with reject6/accept6 line: they crash " + "older Tors."); + goto err; + } exit_policy_tokens = find_all_exitpolicy(tokens); if (!smartlist_len(exit_policy_tokens)) { log_warn(LD_DIR, "No exit policy tokens in descriptor.");

1 0

[tor/release-0.2.1] changes file for careful_with_all_descs
by arma＠torproject.org 11 May '11

11 May '11

commit b231026c42ea5cd884b4bde25cde3ba2c6e5ca98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:35:24 2011 -0500 changes file for careful_with_all_descs --- changes/all_descs | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/all_descs b/changes/all_descs new file mode 100644 index 0000000..10711b2 --- /dev/null +++ b/changes/all_descs @@ -0,0 +1,4 @@ + o Major bugfixes (bridge authority) + - Do not allow encrypte requests for "all" bridges to return all + bridges. +

1 0

[torspec/master] Fix minor issues
by nickm＠torproject.org 11 May '11

11 May '11

commit 051ed9a1727c83a489a2e50fd8a8ef10b117d2db Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon May 9 19:32:55 2011 -0700 Fix minor issues --- control-spec.txt | 2 +- dir-spec.txt | 2 +- path-spec.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index c0a0a0e..38c327b 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -25,7 +25,7 @@ TC is a bidirectional message-based protocol. It assumes an underlying stream for communication between a controlling process (the "client" or "controller") and a Tor process (or "server"). The stream may be - implemented via TCP, TLS-over-TCP, a Unix-doma2in socket, or so on, + implemented via TCP, TLS-over-TCP, a Unix-domain socket, or so on, but it must provide reliable in-order delivery. For security, the stream should not be accessible by untrusted parties. diff --git a/dir-spec.txt b/dir-spec.txt index 0e17e6e..a4dd14f 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1448,7 +1448,7 @@ Two strategies exist on the current network for deciding on values for the Named flag. In the original version, relay operators were asked to send nickname-identity pairs to a - mailing list of Naming directory authorities operators. The + mailing list of Naming directory authorities' operators. The operators were then supposed to add the pairs to their mapping files; in practice, they didn't get to this often. diff --git a/path-spec.txt b/path-spec.txt index 90e3160..480772e 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -147,7 +147,7 @@ of their choices. 2.1.3. Relays build circuits for testing reachability and bandwidth Tor relays test reachability of their ORPort once they have - successfully built a circuit (on start and whenever their IP address + successfully built a circuit (on startup and whenever their IP address changes). They build an ordinary fast internal circuit with themselves as the last hop. As soon as any testing circuit succeeds, the Tor relay decides it's reachable and is willing to publish a descriptor.

1 0

[arm/master] fix: Config value changes weren't being reflected
by atagar＠torproject.org 10 May '11

10 May '11

commit 8e90af9c9eb4af4f3fa12d7f12c19279314d8b64 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 22:04:21 2011 -0700 fix: Config value changes weren't being reflected When a value was edited in the configuration panel the listed value didn't change (though it did in other places like the detail panel). This was due to a cached copy of the display element. Flushing this cache when editing values. --- src/cli/configPanel.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 37b7ddb..b6fba8b 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -293,6 +293,9 @@ class ConfigPanel(panel.Panel): torTools.getConn().setOption(configOption, newValue) + # forces the label to be remade with the new value + selection.labelCache = None + # resets the isDefault flag customOptions = torConfig.getCustomOptions() selection.fields[Field.IS_DEFAULT] = not configOption in customOptions

1 0

[arm/master] fix: Never show conn details if panel's empty
by atagar＠torproject.org 10 May '11

10 May '11

commit ea8799aab65ad6509972ddebcdd0c3eb7f3e9769 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 19:14:28 2011 -0700 fix: Never show conn details if panel's empty The connection panel could get stuck in the 'show connection details' mode if the panel's contents became empty while we were showing something. This wouldn't crash (like with the issue addressed in the previous fix), but the panel title would be wrong. This reverts the 'show details' flag if we don't have any contents. --- src/cli/connections/connPanel.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 36687ac..8ecffc2 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -151,7 +151,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if self._showDetails: pageHeight -= (DETAILS_HEIGHT + 1) isChanged = self._scroller.handleKey(key, self._entryLines, pageHeight) if isChanged: self.redraw(True) - elif uiTools.isSelectionKey(key) and self._entries: + elif uiTools.isSelectionKey(key): self._showDetails = not self._showDetails self.redraw(True) elif key == ord('s') or key == ord('S'): @@ -248,6 +248,9 @@ class ConnectionPanel(panel.Panel, threading.Thread): def draw(self, width, height): self.valsLock.acquire() + # if we don't have any contents then refuse to show details + if not self._entries: self._showDetails = False + # extra line when showing the detail panel is for the bottom border detailPanelOffset = DETAILS_HEIGHT + 1 if self._showDetails else 0 isScrollbarVisible = len(self._entryLines) > height - detailPanelOffset - 1

1 0

[arm/master] Moving config value editing to the config panel
by atagar＠torproject.org 10 May '11

10 May '11

commit 52998db3600cdc42e4290b9b3fa5547390a2893a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 22:02:03 2011 -0700 Moving config value editing to the config panel --- src/cli/configPanel.py | 46 ++++++++++++++++++++++++++++++++++++++ src/cli/controller.py | 57 ------------------------------------------------ src/cli/popups.py | 14 ++++++----- 3 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index 31a78ab..37b7ddb 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -11,6 +11,7 @@ import popups from util import conf, enum, panel, torTools, torConfig, uiTools DEFAULT_CONFIG = {"features.config.selectionDetails.height": 6, + "features.config.prepopulateEditValues": True, "features.config.state.showPrivateOptions": False, "features.config.state.showVirtualOptions": False, "features.config.state.colWidth.option": 25, @@ -135,6 +136,14 @@ class ConfigEntry(): return self.labelCache + def isUnset(self): + """ + True if we have no value, false otherwise. + """ + + confValue = torTools.getConn().getOption(self.get(Field.OPTION), [], True) + return not bool(confValue) + def _getValue(self): """ Provides the current value of the configuration entry, taking advantage of @@ -256,6 +265,43 @@ class ConfigPanel(panel.Panel): isChanged = self.scroller.handleKey(key, self._getConfigOptions(), pageHeight) if isChanged: self.redraw(True) + elif uiTools.isSelectionKey(key): + # Prompts the user to edit the selected configuration value. The + # interface is locked to prevent updates between setting the value + # and showing any errors. + + panel.CURSES_LOCK.acquire() + try: + selection = self.getSelection() + configOption = selection.get(Field.OPTION) + if selection.isUnset(): initialValue = "" + else: initialValue = selection.get(Field.VALUE) + + promptMsg = "%s Value (esc to cancel): " % configOption + isPrepopulated = self._config["features.config.prepopulateEditValues"] + newValue = popups.inputPrompt(promptMsg, initialValue if isPrepopulated else "") + + if newValue != None and newValue != initialValue: + try: + if selection.get(Field.TYPE) == "Boolean": + # if the value's a boolean then allow for 'true' and 'false' inputs + if newValue.lower() == "true": newValue = "1" + elif newValue.lower() == "false": newValue = "0" + elif selection.get(Field.TYPE) == "LineList": + # setOption accepts list inputs when there's multiple values + newValue = newValue.split(",") + + torTools.getConn().setOption(configOption, newValue) + + # resets the isDefault flag + customOptions = torConfig.getCustomOptions() + selection.fields[Field.IS_DEFAULT] = not configOption in customOptions + + self.redraw(True) + except Exception, exc: + popups.showMsg("%s (press any key)" % exc) + finally: + panel.CURSES_LOCK.release() elif key == ord('a') or key == ord('A'): self.showAll = not self.showAll self.redraw(True) diff --git a/src/cli/controller.py b/src/cli/controller.py index 3d40631..63b3b86 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -98,7 +98,6 @@ PAGES = [ CONFIG = {"log.torrc.readFailed": log.WARN, "features.graph.type": 1, - "features.config.prepopulateEditValues": True, "queries.refreshRate.rate": 5, "log.torEventTypeUnrecognized": log.NOTICE, "features.graph.bw.prepopulate": True, @@ -1101,62 +1100,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panel.CURSES_LOCK.release() panels["config"].redraw(True) - elif page == 2 and uiTools.isSelectionKey(key): - # let the user edit the configuration value, unchanged if left blank - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - selection = panels["config"].getSelection() - configOption = selection.get(configPanel.Field.OPTION) - titleMsg = "%s Value (esc to cancel): " % configOption - panels["control"].setMsg(titleMsg) - panels["control"].redraw(True) - - displayWidth = panels["control"].getPreferredSize()[1] - initialValue = selection.get(configPanel.Field.VALUE) - - # initial input for the text field - initialText = "" - if CONFIG["features.config.prepopulateEditValues"] and initialValue != "<none>": - initialText = initialValue - - newConfigValue = panels["control"].getstr(0, len(titleMsg), initialText) - - # it would be nice to quit on esc, but looks like this might not be possible... - if newConfigValue != None and newConfigValue != initialValue: - conn = torTools.getConn() - - # if the value's a boolean then allow for 'true' and 'false' inputs - if selection.get(configPanel.Field.TYPE) == "Boolean": - if newConfigValue.lower() == "true": newConfigValue = "1" - elif newConfigValue.lower() == "false": newConfigValue = "0" - - try: - if selection.get(configPanel.Field.TYPE) == "LineList": - newConfigValue = newConfigValue.split(",") - - conn.setOption(configOption, newConfigValue) - - # resets the isDefault flag - customOptions = torConfig.getCustomOptions() - selection.fields[configPanel.Field.IS_DEFAULT] = not configOption in customOptions - - panels["config"].redraw(True) - except Exception, exc: - errorMsg = "%s (press any key)" % exc - panels["control"].setMsg(uiTools.cropStr(errorMsg, displayWidth), curses.A_STANDOUT) - panels["control"].redraw(True) - - curses.cbreak() # wait indefinitely for key presses (no timeout) - stdscr.getch() - curses.halfdelay(REFRESH_RATE * 10) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/popups.py b/src/cli/popups.py index 81b4589..2b02685 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -44,32 +44,33 @@ def finalize(): controller.refresh() panel.CURSES_LOCK.release() -def inputPrompt(msg): +def inputPrompt(msg, initialValue = ""): """ Prompts the user to enter a string on the control line (which usually displays the page number and basic controls). Arguments: - msg - message to prompt the user for input with + msg - message to prompt the user for input with + initialValue - initial value of the field """ panel.CURSES_LOCK.acquire() controlPanel = controller.getPanel("control") controlPanel.setMsg(msg) controlPanel.redraw(True) - userInput = controlPanel.getstr(0, len(msg)) + userInput = controlPanel.getstr(0, len(msg), initialValue) controlPanel.revertMsg() panel.CURSES_LOCK.release() return userInput -def showMsg(msg, maxWait, attr = curses.A_STANDOUT): +def showMsg(msg, maxWait = -1, attr = curses.A_STANDOUT): """ Displays a single line message on the control line for a set time. Pressing any key will end the message. Arguments: msg - message to be displayed to the user - maxWait - time to show the message + maxWait - time to show the message, indefinite if -1 attr - attributes with which to draw the message """ @@ -78,7 +79,8 @@ def showMsg(msg, maxWait, attr = curses.A_STANDOUT): controlPanel.setMsg(msg, attr) controlPanel.redraw(True) - curses.halfdelay(maxWait * 10) + if maxWait == -1: curses.cbreak() + else: curses.halfdelay(maxWait * 10) controller.getScreen().getch() controlPanel.revertMsg() curses.halfdelay(controller.REFRESH_RATE * 10)

1 0

r24739: {website} move the anchors inside the div tags to match the right sect (website/trunk/donate/en)
by Andrew Lewman 10 May '11

10 May '11

Author: phobos Date: 2011-05-10 02:14:44 +0000 (Tue, 10 May 2011) New Revision: 24739 Modified: website/trunk/donate/en/donate.wml Log: move the anchors inside the div tags to match the right sections. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 02:09:51 UTC (rev 24738) +++ website/trunk/donate/en/donate.wml 2011-05-10 02:14:44 UTC (rev 24739) @@ -29,11 +29,11 @@ </ul></p> <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  - <a id="paypal"></a> - <a class="anchor" href="#paypal"> </a> <div class="title toptwenty">Tor Project Subscription via PayPal</div> <div class="left hundred"> <div class="paypal focus"> + <a id="paypal"></a> + <a class="anchor" href="#paypal"></a> <h4>Monthly Subscription to The Tor Project</h4> <table> <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr" method="post"> @@ -125,11 +125,11 @@ </div>   - <a id="amazon"></a> - <a class="anchor" href="#amazon"> </a> <div class="title topforty">Single Donation via Amazon Payments</div> <div class="hundred left"> <div class="paypal focus"> + <a id="amazon"></a> + <a class="anchor" href="#amazon"></a> <h4>Make a single donation.</h4> <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post"> <table> @@ -157,11 +157,11 @@ </div>   - <a id="google"></a> - <a class="anchor" href="#google"> </a> <div class="title topforty">Single Donation via Google Checkout</div> <div class="hundred left"> <div class="paypal focus"> + <a id="google"></a> + <a class="anchor" href="#google"></a> <h4>Make a single donation.</h4> <script type="text/javascript"> @@ -201,20 +201,20 @@ </div>   - <a id="givv"></a> - <a class="anchor" href="#givv"> </a> <div class="title topforty">Donate via Givv.org</div> <div class="hundred left"> + <a id="givv"></a> + <a class="anchor" href="#givv"></a> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. You stay anonymous and stay in control! <strong><a href="http://givv.org/recipients/the-tor-project">Continue to Givv.org »</a></strong></p> </div>   - <a id="cash"></a> - <a class="anchor" href="#cash"> </a> <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> <div class="left hundred"> + <a id="cash"></a> + <a class="anchor" href="#cash"></a> <p>You can send checks or money orders to:</p> <p>The Tor Project, Inc<br> 969 Main Street, Suite 206<br>

1 0

r24738: {} added new drawable graphics resource for errors (projects/android/trunk/Orbot/res/drawable)
by Nathan Freitas 10 May '11

10 May '11

Author: n8fr8 Date: 2011-05-10 02:09:51 +0000 (Tue, 10 May 2011) New Revision: 24738 Added: projects/android/trunk/Orbot/res/drawable/torerror.png Log: added new drawable graphics resource for errors Added: projects/android/trunk/Orbot/res/drawable/torerror.png =================================================================== (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/torerror.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream

1 0

r24737: {projects} project file modifications (projects/android/trunk/Orbot)
by Nathan Freitas 10 May '11

10 May '11

Author: n8fr8 Date: 2011-05-10 02:08:50 +0000 (Tue, 10 May 2011) New Revision: 24737 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/BUILD projects/android/trunk/Orbot/CHANGELOG Log: project file modifications Modified: projects/android/trunk/Orbot/AndroidManifest.xml =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-10 02:08:50 UTC (rev 24737) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5.20110503a-dev" android:versionCode="11"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5" android:versionCode="11"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> @@ -46,9 +46,8 @@ <receiver android:name=".OnBootReceiver"> <intent-filter> - <action - android:name="android.intent.action.BOOT_COMPLETED" /> - <category android:name="android.intent.category.HOME" /> + <action android:name="android.intent.action.BOOT_COMPLETED" /> + <category android:name="android.intent.category.HOME" /> </intent-filter> </receiver> Modified: projects/android/trunk/Orbot/BUILD =================================================================== --- projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:50 UTC (rev 24737) @@ -73,7 +73,7 @@ cd ~/mydroid/external/libevent svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.12-stabl… . - export LIBEVENTDIR=`pwd` + export LIBEVENTDIR=`cd $DROID_ROOT/external/libevent && pwd` ./autogen.sh # Put the contents of http://pastebin.ca/1577207 in /tmp/libevent-patch patch < /tmp/libevent-patch @@ -81,14 +81,14 @@ make Copy over the libevent library: - cp .libs/libevent.a ~/mydroid/out/target/product/generic/obj/lib + cp .libs/libevent.a $DROID_ROOT/out/target/product/generic/obj/lib Fetch and build Tor: - export OPENSSLDIR=`cd ~/mydroid/external/openssl/include/ && pwd` - export ZLIBDIR=`cd ~/mydroid/external/zlib && pwd` + export OPENSSLDIR=`cd $DROID_ROOT/external/openssl/include/ && pwd` + export ZLIBDIR=`cd $DROID_ROOT/external/zlib && pwd` - cd ~/mydroid/external/tor + cd $DROID_ROOT/external/tor git clone git://git.torproject.org/git/tor.git cd tor/ ./autogen.sh @@ -98,17 +98,16 @@ make At this point, you'll have a Tor binary that can be run on an Android handset. +You can verify the ARM binary was properly built using the following command: + +file src/or/tor + +You should see something like: +src/or/tor: ELF 32-bit LSB executable, ARM, version 1 (SYSV), dynamically linked (uses shared libs), not stripped + This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features. -We need to build our Java SOCKS library: - - # If you're in Orbot's directory already... - cd ../asocks/ - ant compile - ant jar - cp bin/jar/asocks.jar ../Orbot/libs - We need to get the TorControl library for Java: (see also https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt) @@ -124,8 +123,8 @@ export APP_SDK=~/Documents/projects/android/android-sdk-linux_x86-1.5_r3/tools cd ../Orbot/ - cp ~/mydroid/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy - cp ~/mydroid/external/tor/tor/src/or/tor assets/tor + cp $DROID_ROOT/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy + cp $DROID_ROOT/external/tor/tor/src/or/tor assets/tor $APP_SDK/android update project --name Orbot --target 3 --path . ant release Modified: projects/android/trunk/Orbot/CHANGELOG =================================================================== --- projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:50 UTC (rev 24737) @@ -1,6 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.5 +- fixed tor binary installation issue related to max resource size and compression +- updated "start on boot" code to test for proper launch event - updated to Tor 0.2.2.25-alpha binary - moved back to single notification bar id to avoid double entries - cleaned up progress dialog and alert handling to avoid leaky windows

1 0