- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2
by mikeperry＠torproject.org 01 May '12

01 May '12

commit 0576295b7731888fabcf71c454444e35ab1515e1 Merge: a9c5648 7945762 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Apr 27 10:46:26 2012 -0700 Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2 README.LINUX-2.2 | 10 ++++---- README.OSX-2.2 | 10 ++++---- README.WIN-2.2 | 10 ++++---- build-scripts/config/mozconfig-osx-x86_64 | 9 ++++--- build-scripts/linux.mk | 6 ++-- build-scripts/osx.mk | 22 ++++++++++---------- build-scripts/versions.mk | 8 +++--- build-scripts/windows.mk | 4 +- changelog.linux-2.2 | 16 ++++++++++++++ changelog.osx-2.2 | 19 +++++++++++++++++ changelog.windows-2.2 | 16 ++++++++++++++ ...ize-HTTP-request-order-and-pipeline-depth.patch | 21 +++++++++++++++++- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 +- 13 files changed, 112 insertions(+), 43 deletions(-)

1 0

[torbrowser/maint-2.2] Add in Steven Michaud's Mac crash fix patch.
by mikeperry＠torproject.org 01 May '12

01 May '12

commit db392ac33b484938c72df171db94f5ae0ee47f3c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Apr 26 11:03:48 2012 -0700 Add in Steven Michaud's Mac crash fix patch. Also remove a patch that it includes. --- .../0015-Add-DDG-and-StartPage-to-Omnibox.patch | 84 +++ .../0015-Undo-some-Mozilla-braindamage.patch | 28 - ...ven-Michaud-s-Mac-crashfix-patch-for-FF12.patch | 539 ++++++++++++++++++++ .../0016-Add-DDG-and-StartPage-to-Omnibox.patch | 84 --- 4 files changed, 623 insertions(+), 112 deletions(-) diff --git a/src/current-patches/firefox/0015-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0015-Add-DDG-and-StartPage-to-Omnibox.patch new file mode 100644 index 0000000..e0740ae --- /dev/null +++ b/src/current-patches/firefox/0015-Add-DDG-and-StartPage-to-Omnibox.patch @@ -0,0 +1,84 @@ +From db055738d6431057670e8f219616170ed3644a9e Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 25 Apr 2012 15:03:46 -0700 +Subject: [PATCH 15/16] Add DDG and StartPage to Omnibox. + +You mean there are search engines that don't require captchas if you don't +have a cookie? Holy crap. Get those in there now. +--- + browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ + browser/locales/en-US/searchplugins/list.txt | 2 + + browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ + 3 files changed, 42 insertions(+), 0 deletions(-) + create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml + create mode 100644 browser/locales/en-US/searchplugins/startpage.xml + +diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml +new file mode 100644 +index 0000000..4f00b4d +--- /dev/null ++++ b/browser/locales/en-US/searchplugins/duckduckgo.xml +@@ -0,0 +1,29 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> ++<ShortName>DuckDuckGo</ShortName> ++<Description>Duck Duck Go</Description> ++<InputEncoding>UTF-8</InputEncoding> ++<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAA ++AAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8n ++IOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rB ++Uv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n///// ++/05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v// ++//////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9h ++XPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg ++7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs ++5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/ ++JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8n IOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg ++7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1 ++/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/ ++fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y ++1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg ++7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDs ++AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA ++AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA ++AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD ++AADwDwAA+B8AAA==</Image> ++<Url type="text/html" method="POST" template="https://duckduckgo.com/html/"> ++ <Param name="q" value="{searchTerms}"/> ++</Url> ++<SearchForm>https://duckduckgo.com/html/</SearchForm> ++</SearchPlugin> +diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt +index 2a1141a..0466f4e 100644 +--- a/browser/locales/en-US/searchplugins/list.txt ++++ b/browser/locales/en-US/searchplugins/list.txt +@@ -1,7 +1,9 @@ + amazondotcom + bing ++duckduckgo + eBay + google ++startpage + twitter + wikipedia + yahoo +diff --git a/browser/locales/en-US/searchplugins/startpage.xml b/browser/locales/en-US/searchplugins/startpage.xml +new file mode 100644 +index 0000000..1a310b1 +--- /dev/null ++++ b/browser/locales/en-US/searchplugins/startpage.xml +@@ -0,0 +1,11 @@ ++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> ++<ShortName>Startpage</ShortName> ++<Description>Start Page</Description> ++<InputEncoding>UTF-8</InputEncoding> ++<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH+ +LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image> ++ ++<Url type="text/html" method="POST" template="https://startpage.com/do/search"> ++ <Param name="q" value="{searchTerms}"/> ++</Url> ++<SearchForm>https://startpage.com/do/search/</SearchForm> ++</SearchPlugin> +-- +1.7.5.4 + diff --git a/src/current-patches/firefox/0015-Undo-some-Mozilla-braindamage.patch b/src/current-patches/firefox/0015-Undo-some-Mozilla-braindamage.patch deleted file mode 100644 index 88e204f..0000000 --- a/src/current-patches/firefox/0015-Undo-some-Mozilla-braindamage.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 74be7d742204d48fbb51a90275781378948ba749 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Wed, 25 Apr 2012 13:42:52 -0700 -Subject: [PATCH 15/16] Undo some Mozilla braindamage. - -https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c33 - -Seriously guys? ---- - widget/nsIDragService.idl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/widget/nsIDragService.idl b/widget/nsIDragService.idl -index e42c578..6863a88 100644 ---- a/widget/nsIDragService.idl -+++ b/widget/nsIDragService.idl -@@ -48,7 +48,7 @@ interface nsIDOMDragEvent; - interface nsIDOMDataTransfer; - interface nsISelection; - --[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052), builtinclass] -+[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052)] - interface nsIDragService : nsISupports - { - const long DRAGDROP_ACTION_NONE = 0; --- -1.7.5.4 - diff --git a/src/current-patches/firefox/0016-Adapt-Steven-Michaud-s-Mac-crashfix-patch-for-FF12.patch b/src/current-patches/firefox/0016-Adapt-Steven-Michaud-s-Mac-crashfix-patch-for-FF12.patch new file mode 100644 index 0000000..16de3d9 --- /dev/null +++ b/src/current-patches/firefox/0016-Adapt-Steven-Michaud-s-Mac-crashfix-patch-for-FF12.patch @@ -0,0 +1,539 @@ +From d56b1a845aa9a9528eb1f9db8ce8a67d85683b28 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 26 Apr 2012 10:54:24 -0700 +Subject: [PATCH 16/16] Adapt Steven Michaud's Mac crashfix patch for FF12. + +Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + +Some minor tweaks were needed to get it to apply to FF12. +--- + widget/Makefile.in | 1 + + widget/cocoa/nsChildView.mm | 31 +++++++++++-------- + widget/gtk2/nsDragService.cpp | 2 +- + widget/gtk2/nsWindow.cpp | 2 +- + widget/nsIDragService.idl | 4 +-- + widget/nsPIDragService.idl | 48 +++++++++++++++++++++++++++++ + widget/qt/nsDragService.h | 2 + + widget/windows/Makefile.in | 4 ++ + widget/windows/nsDragService.cpp | 13 +++++--- + widget/windows/nsDragService.h | 12 +++--- + widget/windows/nsNativeDragSource.cpp | 7 ++-- + widget/windows/nsNativeDragTarget.cpp | 28 ++++++++++------ + widget/windows/nsPIDragServiceWindows.idl | 46 +++++++++++++++++++++++++++ + widget/xpwidgets/nsBaseDragService.cpp | 16 +++++++++- + widget/xpwidgets/nsBaseDragService.h | 9 ++--- + 15 files changed, 176 insertions(+), 49 deletions(-) + create mode 100644 widget/nsPIDragService.idl + create mode 100644 widget/windows/nsPIDragServiceWindows.idl + +diff --git a/widget/Makefile.in b/widget/Makefile.in +index 4a3405b..4c105a4 100644 +--- a/widget/Makefile.in ++++ b/widget/Makefile.in +@@ -138,6 +138,7 @@ XPIDLSRCS = \ + nsIClipboardDragDropHooks.idl \ + nsIClipboardDragDropHookList.idl \ + nsIDragSession.idl \ ++ nsPIDragService.idl \ + nsIDragService.idl \ + nsIFormatConverter.idl \ + nsIClipboard.idl \ +diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm +index 7f738a1..189b9ef 100644 +--- a/widget/cocoa/nsChildView.mm ++++ b/widget/cocoa/nsChildView.mm +@@ -4566,11 +4566,12 @@ NSEvent* gLastDragMouseDownEvent = nil; + if (!dragService) { + dragService = do_GetService(kDragServiceContractID); + } ++ nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(dragService); + + if (dragService) { + NSPoint pnt = [NSEvent mouseLocation]; + FlipCocoaScreenCoordinate(pnt); +- dragService->DragMoved(NSToIntRound(pnt.x), NSToIntRound(pnt.y)); ++ dragServicePriv->DragMoved(NSToIntRound(pnt.x), NSToIntRound(pnt.y)); + } + } + +@@ -4591,11 +4592,13 @@ NSEvent* gLastDragMouseDownEvent = nil; + } + + if (mDragService) { +- // set the dragend point from the current mouse location +- nsDragService* dragService = static_cast<nsDragService *>(mDragService); +- NSPoint pnt = [NSEvent mouseLocation]; +- FlipCocoaScreenCoordinate(pnt); +- dragService->SetDragEndPoint(nsIntPoint(NSToIntRound(pnt.x), NSToIntRound(pnt.y))); ++ nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(mDragService); ++ if (dragServicePriv) { ++ // set the dragend point from the current mouse location ++ NSPoint pnt = [NSEvent mouseLocation]; ++ FlipCocoaScreenCoordinate(pnt); ++ dragServicePriv->SetDragEndPoint(NSToIntRound(pnt.x), NSToIntRound(pnt.y)); ++ } + + // XXX: dropEffect should be updated per |operation|. + // As things stand though, |operation| isn't well handled within "our" +@@ -4606,13 +4609,15 @@ NSEvent* gLastDragMouseDownEvent = nil; + // value for NSDragOperationGeneric that is passed by other applications. + // All that said, NSDragOperationNone is still reliable. + if (operation == NSDragOperationNone) { +- nsCOMPtr<nsIDOMDataTransfer> dataTransfer; +- dragService->GetDataTransfer(getter_AddRefs(dataTransfer)); +- nsCOMPtr<nsIDOMNSDataTransfer> dataTransferNS = +- do_QueryInterface(dataTransfer); +- +- if (dataTransferNS) +- dataTransferNS->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE); ++ nsCOMPtr<nsIDragSession> dragSession; ++ mDragService->GetCurrentSession(getter_AddRefs(dragSession)); ++ if (dragSession) { ++ nsCOMPtr<nsIDOMDataTransfer> dataTransfer; ++ dragSession->GetDataTransfer(getter_AddRefs(dataTransfer)); ++ if (dataTransfer) { ++ dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE); ++ } ++ } + } + + mDragService->EndDragSession(true); +diff --git a/widget/gtk2/nsDragService.cpp b/widget/gtk2/nsDragService.cpp +index ca5a42c..876fd55 100644 +--- a/widget/gtk2/nsDragService.cpp ++++ b/widget/gtk2/nsDragService.cpp +@@ -1334,7 +1334,7 @@ nsDragService::SourceEndDragSession(GdkDragContext *aContext, + GdkDisplay* display = gdk_display_get_default(); + if (display) { + gdk_display_get_pointer(display, NULL, &x, &y, NULL); +- SetDragEndPoint(nsIntPoint(x, y)); ++ SetDragEndPoint(x, y); + } + + // Either the drag was aborted or the drop occurred outside the app. +diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp +index 5e4afee..25c394b 100644 +--- a/widget/gtk2/nsWindow.cpp ++++ b/widget/gtk2/nsWindow.cpp +@@ -3698,7 +3698,7 @@ nsWindow::OnDragDropEvent(GtkWidget *aWidget, + if (display) { + // get the current cursor position + gdk_display_get_pointer(display, NULL, &x, &y, NULL); +- ((nsDragService *)dragService.get())->SetDragEndPoint(nsIntPoint(x, y)); ++ ((nsDragService *)dragService.get())->SetDragEndPoint(x, y); + } + dragService->EndDragSession(true); + +diff --git a/widget/nsIDragService.idl b/widget/nsIDragService.idl +index e42c578..ef8c46f 100644 +--- a/widget/nsIDragService.idl ++++ b/widget/nsIDragService.idl +@@ -48,7 +48,7 @@ interface nsIDOMDragEvent; + interface nsIDOMDataTransfer; + interface nsISelection; + +-[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052), builtinclass] ++[scriptable, uuid(82B58ADA-F490-4C3D-B737-1057C4F1D052)] + interface nsIDragService : nsISupports + { + const long DRAGDROP_ACTION_NONE = 0; +@@ -145,8 +145,6 @@ interface nsIDragService : nsISupports + */ + void suppress(); + void unsuppress(); +- +- [noscript] void dragMoved(in long aX, in long aY); + }; + + +diff --git a/widget/nsPIDragService.idl b/widget/nsPIDragService.idl +new file mode 100644 +index 0000000..93a144d +--- /dev/null ++++ b/widget/nsPIDragService.idl +@@ -0,0 +1,48 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * The Mozilla Foundation. ++ * Portions created by the Initial Developer are Copyright (C) 2012 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Steven Michaud <smichaud(a)pobox.com> ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(FAD8C90B-8E1D-446A-9B6C-241486A85CBD)] ++interface nsPIDragService : nsISupports ++{ ++ void dragMoved(in long aX, in long aY); ++ ++ PRUint16 getInputSource(); ++ ++ void setDragEndPoint(in long aX, in long aY); ++}; +diff --git a/widget/qt/nsDragService.h b/widget/qt/nsDragService.h +index 5a3e5bb..50dcfac 100644 +--- a/widget/qt/nsDragService.h ++++ b/widget/qt/nsDragService.h +@@ -50,6 +50,8 @@ public: + NS_DECL_ISUPPORTS + NS_DECL_NSIDRAGSERVICE + ++ NS_IMETHOD DragMoved(PRInt32 aX, PRInt32 aY); ++ + nsDragService(); + + private: +diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in +index c9327f8..3298997 100644 +--- a/widget/windows/Makefile.in ++++ b/widget/windows/Makefile.in +@@ -119,6 +119,10 @@ ifdef MOZ_ENABLE_D3D10_LAYER + DEFINES += -DMOZ_ENABLE_D3D10_LAYER + endif + ++XPIDLSRCS += \ ++ nsPIDragServiceWindows.idl \ ++ $(NULL) ++ + SHARED_LIBRARY_LIBS = \ + ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ + $(NULL) +diff --git a/widget/windows/nsDragService.cpp b/widget/windows/nsDragService.cpp +index 8c5df7e..1cf9995 100644 +--- a/widget/windows/nsDragService.cpp ++++ b/widget/windows/nsDragService.cpp +@@ -97,6 +97,8 @@ nsDragService::~nsDragService() + NS_IF_RELEASE(mDataObject); + } + ++NS_IMPL_ISUPPORTS_INHERITED1(nsDragService, nsBaseDragService, nsPIDragServiceWindows) ++ + bool + nsDragService::CreateDragImage(nsIDOMNode *aDOMNode, + nsIScriptableRegion *aRegion, +@@ -350,7 +352,7 @@ nsDragService::StartInvokingDragSession(IDataObject * aDataObj, + POINT cpos; + cpos.x = GET_X_LPARAM(pos); + cpos.y = GET_Y_LPARAM(pos); +- SetDragEndPoint(nsIntPoint(cpos.x, cpos.y)); ++ SetDragEndPoint(cpos.x, cpos.y); + EndDragSession(true); + + mDoingDrag = false; +@@ -468,25 +470,26 @@ nsDragService::GetData(nsITransferable * aTransferable, PRUint32 anItem) + + //--------------------------------------------------------- + NS_IMETHODIMP +-nsDragService::SetIDataObject(IDataObject * aDataObj) ++nsDragService::SetIDataObject(nsISupports * aDataObj) + { ++ IDataObject *dataObj = (IDataObject*) aDataObj; + // When the native drag starts the DragService gets + // the IDataObject that is being dragged + NS_IF_RELEASE(mDataObject); +- mDataObject = aDataObj; ++ mDataObject = dataObj; + NS_IF_ADDREF(mDataObject); + + return NS_OK; + } + + //--------------------------------------------------------- +-void ++NS_IMETHODIMP + nsDragService::SetDroppedLocal() + { + // Sent from the native drag handler, letting us know + // a drop occurred within the application vs. outside of it. + mSentLocalDropEvent = true; +- return; ++ return NS_OK; + } + + //------------------------------------------------------------------------- +diff --git a/widget/windows/nsDragService.h b/widget/windows/nsDragService.h +index 87d6cc9..04c8746 100644 +--- a/widget/windows/nsDragService.h ++++ b/widget/windows/nsDragService.h +@@ -39,6 +39,7 @@ + #define nsDragService_h__ + + #include "nsBaseDragService.h" ++#include "nsPIDragServiceWindows.h" + #include <windows.h> + #include <shlobj.h> + +@@ -52,12 +53,15 @@ class nsString; + * Native Win32 DragService wrapper + */ + +-class nsDragService : public nsBaseDragService ++class nsDragService : public nsBaseDragService, public nsPIDragServiceWindows + { + public: + nsDragService(); + virtual ~nsDragService(); +- ++ ++ NS_DECL_ISUPPORTS_INHERITED ++ NS_DECL_NSPIDRAGSERVICEWINDOWS ++ + // nsIDragService + NS_IMETHOD InvokeDragSession(nsIDOMNode *aDOMNode, + nsISupportsArray *anArrayTransferables, +@@ -71,13 +75,9 @@ public: + NS_IMETHOD EndDragSession(bool aDoneDrag); + + // native impl. +- NS_IMETHOD SetIDataObject(IDataObject * aDataObj); + NS_IMETHOD StartInvokingDragSession(IDataObject * aDataObj, + PRUint32 aActionType); + +- // A drop occurred within the application vs. outside of it. +- void SetDroppedLocal(); +- + protected: + nsDataObjCollection* GetDataObjCollection(IDataObject * aDataObj); + +diff --git a/widget/windows/nsNativeDragSource.cpp b/widget/windows/nsNativeDragSource.cpp +index e51101e..0fe6ffe 100644 +--- a/widget/windows/nsNativeDragSource.cpp ++++ b/widget/windows/nsNativeDragSource.cpp +@@ -42,7 +42,7 @@ + #include "nsIServiceManager.h" + #include "nsToolkit.h" + #include "nsWidgetsCID.h" +-#include "nsIDragService.h" ++#include "nsDragService.h" + + static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID); + +@@ -101,9 +101,10 @@ STDMETHODIMP + nsNativeDragSource::QueryContinueDrag(BOOL fEsc, DWORD grfKeyState) + { + nsCOMPtr<nsIDragService> dragService = do_GetService(kCDragServiceCID); +- if (dragService) { ++ nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(dragService); ++ if (dragServicePriv) { + DWORD pos = ::GetMessagePos(); +- dragService->DragMoved(GET_X_LPARAM(pos), GET_Y_LPARAM(pos)); ++ dragServicePriv->DragMoved(GET_X_LPARAM(pos), GET_Y_LPARAM(pos)); + } + + if (fEsc) { +diff --git a/widget/windows/nsNativeDragTarget.cpp b/widget/windows/nsNativeDragTarget.cpp +index cf6196b..82ad3c6 100644 +--- a/widget/windows/nsNativeDragTarget.cpp ++++ b/widget/windows/nsNativeDragTarget.cpp +@@ -209,7 +209,11 @@ nsNativeDragTarget::DispatchDragDropEvent(PRUint32 aEventType, POINTL aPT) + event.isControl = IsKeyDown(NS_VK_CONTROL); + event.isMeta = false; + event.isAlt = IsKeyDown(NS_VK_ALT); +- event.inputSource = static_cast<nsBaseDragService*>(mDragService)->GetInputSource(); ++ event.inputSource = 0; ++ nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(mDragService); ++ if (dragServicePriv) { ++ dragServicePriv->GetInputSource(&event.inputSource); ++ } + + mWindow->DispatchEvent(&event, status); + } +@@ -296,9 +300,8 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource, + // This cast is ok because in the constructor we created a + // the actual implementation we wanted, so we know this is + // a nsDragService. It should be a private interface, though. +- nsDragService * winDragService = +- static_cast<nsDragService *>(mDragService); +- winDragService->SetIDataObject(pIDataSource); ++ nsCOMPtr<nsPIDragServiceWindows> winDragService = do_QueryInterface(mDragService); ++ winDragService->SetIDataObject((nsISupports*)pIDataSource); + + // Now process the native drag state and then dispatch the event + ProcessDrag(NS_DRAGDROP_ENTER, grfKeyState, ptl, pdwEffect); +@@ -436,8 +439,8 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData, + // This cast is ok because in the constructor we created a + // the actual implementation we wanted, so we know this is + // a nsDragService (but it should still be a private interface) +- nsDragService* winDragService = static_cast<nsDragService*>(mDragService); +- winDragService->SetIDataObject(pData); ++ nsCOMPtr<nsPIDragServiceWindows> winDragService = do_QueryInterface(mDragService); ++ winDragService->SetIDataObject((nsISupports*)pData); + + // NOTE: ProcessDrag spins the event loop which may destroy arbitrary objects. + // We use strong refs to prevent it from destroying these: +@@ -461,11 +464,14 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData, + // tell the drag service we're done with the session + // Use GetMessagePos to get the position of the mouse at the last message + // seen by the event loop. (Bug 489729) +- DWORD pos = ::GetMessagePos(); +- POINT cpos; +- cpos.x = GET_X_LPARAM(pos); +- cpos.y = GET_Y_LPARAM(pos); +- winDragService->SetDragEndPoint(nsIntPoint(cpos.x, cpos.y)); ++ nsCOMPtr<nsPIDragService> dragServicePriv = do_QueryInterface(mDragService); ++ if (dragServicePriv) { ++ DWORD pos = ::GetMessagePos(); ++ POINT cpos; ++ cpos.x = GET_X_LPARAM(pos); ++ cpos.y = GET_Y_LPARAM(pos); ++ dragServicePriv->SetDragEndPoint(cpos.x, cpos.y); ++ } + serv->EndDragSession(true); + + // release the ref that was taken in DragEnter +diff --git a/widget/windows/nsPIDragServiceWindows.idl b/widget/windows/nsPIDragServiceWindows.idl +new file mode 100644 +index 0000000..c8a46dd +--- /dev/null ++++ b/widget/windows/nsPIDragServiceWindows.idl +@@ -0,0 +1,46 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is mozilla.org code. ++ * ++ * The Initial Developer of the Original Code is ++ * The Mozilla Foundation. ++ * Portions created by the Initial Developer are Copyright (C) 2012 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Steven Michaud <smichaud(a)pobox.com> ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsISupports.idl" ++ ++[scriptable, uuid(6FC2117D-5EB4-441A-9C12-62A783BEBC0C)] ++interface nsPIDragServiceWindows : nsISupports ++{ ++ void setIDataObject(in nsISupports aDataObj); ++ ++ void setDroppedLocal(); ++}; +diff --git a/widget/xpwidgets/nsBaseDragService.cpp b/widget/xpwidgets/nsBaseDragService.cpp +index 342a036..87e28f7 100644 +--- a/widget/xpwidgets/nsBaseDragService.cpp ++++ b/widget/xpwidgets/nsBaseDragService.cpp +@@ -88,7 +88,7 @@ nsBaseDragService::~nsBaseDragService() + { + } + +-NS_IMPL_ISUPPORTS2(nsBaseDragService, nsIDragService, nsIDragSession) ++NS_IMPL_ISUPPORTS3(nsBaseDragService, nsIDragService, nsPIDragService, nsIDragSession) + + //--------------------------------------------------------- + NS_IMETHODIMP +@@ -436,6 +436,20 @@ nsBaseDragService::DragMoved(PRInt32 aX, PRInt32 aY) + return NS_OK; + } + ++NS_IMETHODIMP ++nsBaseDragService::SetDragEndPoint(PRInt32 aX, PRInt32 aY) ++{ ++ mEndDragPoint = nsIntPoint(aX, aY); ++ return NS_OK; ++} ++ ++NS_IMETHODIMP ++nsBaseDragService::GetInputSource(PRUint16* aInputSource) ++{ ++ *aInputSource = mInputSource; ++ return NS_OK; ++} ++ + static nsIPresShell* + GetPresShellForContent(nsIDOMNode* aDOMNode) + { +diff --git a/widget/xpwidgets/nsBaseDragService.h b/widget/xpwidgets/nsBaseDragService.h +index 290c0cb..2ceac2b 100644 +--- a/widget/xpwidgets/nsBaseDragService.h ++++ b/widget/xpwidgets/nsBaseDragService.h +@@ -39,6 +39,7 @@ + #define nsBaseDragService_h__ + + #include "nsIDragService.h" ++#include "nsPIDragService.h" + #include "nsIDragSession.h" + #include "nsITransferable.h" + #include "nsISupportsArray.h" +@@ -64,6 +65,7 @@ class nsICanvasElementExternal; + */ + + class nsBaseDragService : public nsIDragService, ++ public nsPIDragService, + public nsIDragSession + { + +@@ -74,14 +76,11 @@ public: + //nsISupports + NS_DECL_ISUPPORTS + +- //nsIDragSession and nsIDragService ++ //nsIDragSession, nsIDragService and nsPIDragService + NS_DECL_NSIDRAGSERVICE ++ NS_DECL_NSPIDRAGSERVICE + NS_DECL_NSIDRAGSESSION + +- void SetDragEndPoint(nsIntPoint aEndDragPoint) { mEndDragPoint = aEndDragPoint; } +- +- PRUint16 GetInputSource() { return mInputSource; } +- + protected: + + /** +-- +1.7.5.4 + diff --git a/src/current-patches/firefox/0016-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0016-Add-DDG-and-StartPage-to-Omnibox.patch deleted file mode 100644 index 2206d96..0000000 --- a/src/current-patches/firefox/0016-Add-DDG-and-StartPage-to-Omnibox.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 67552486c7e0a1b8797e0cb562bddf771aa2015b Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Wed, 25 Apr 2012 15:03:46 -0700 -Subject: [PATCH 16/16] Add DDG and StartPage to Omnibox. - -You mean there are search engines that don't require captchas if you don't -have a cookie? Holy crap. Get those in there now. ---- - browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ - browser/locales/en-US/searchplugins/list.txt | 2 + - browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) - create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml - create mode 100644 browser/locales/en-US/searchplugins/startpage.xml - -diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml -new file mode 100644 -index 0000000..4f00b4d ---- /dev/null -+++ b/browser/locales/en-US/searchplugins/duckduckgo.xml -@@ -0,0 +1,29 @@ -+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> -+<ShortName>DuckDuckGo</ShortName> -+<Description>Duck Duck Go</Description> -+<InputEncoding>UTF-8</InputEncoding> -+<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAA -+AAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAA -+AAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8n -+IOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rB -+Uv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n///// -+/05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v// -+//////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9h -+XPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg -+7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs -+5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/ -+JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8n IOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg -+7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1 -+/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/ -+fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y -+1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg -+7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDs -+AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA -+AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA -+AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD -+AADwDwAA+B8AAA==</Image> -+<Url type="text/html" method="POST" template="https://duckduckgo.com/html/"> -+ <Param name="q" value="{searchTerms}"/> -+</Url> -+<SearchForm>https://duckduckgo.com/html/</SearchForm> -+</SearchPlugin> -diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt -index 2a1141a..0466f4e 100644 ---- a/browser/locales/en-US/searchplugins/list.txt -+++ b/browser/locales/en-US/searchplugins/list.txt -@@ -1,7 +1,9 @@ - amazondotcom - bing -+duckduckgo - eBay - google -+startpage - twitter - wikipedia - yahoo -diff --git a/browser/locales/en-US/searchplugins/startpage.xml b/browser/locales/en-US/searchplugins/startpage.xml -new file mode 100644 -index 0000000..1a310b1 ---- /dev/null -+++ b/browser/locales/en-US/searchplugins/startpage.xml -@@ -0,0 +1,11 @@ -+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> -+<ShortName>Startpage</ShortName> -+<Description>Start Page</Description> -+<InputEncoding>UTF-8</InputEncoding> -+<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH+ +LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image> -+ -+<Url type="text/html" method="POST" template="https://startpage.com/do/search"> -+ <Param name="q" value="{searchTerms}"/> -+</Url> -+<SearchForm>https://startpage.com/do/search/</SearchForm> -+</SearchPlugin> --- -1.7.5.4 -

1 0

[tor/master] Add a missing ntohl to tell_controller_about_resolve_result
by arma＠torproject.org 01 May '12

01 May '12

commit c9afd6f9c5a3cf73340e528818570b4ba5cdf6b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 16:39:49 2012 -0400 Add a missing ntohl to tell_controller_about_resolve_result Fix for bug 5723; bugfix on 0.2.3.1-alpha (commit 22f723e4) --- changes/bug5723 | 4 ++++ src/or/connection_edge.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug5723 b/changes/bug5723 new file mode 100644 index 0000000..7f0dcb8 --- /dev/null +++ b/changes/bug5723 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Format IPv4 addresses correctly in ADDRMAP events. (Previously, + we had reversed them when the answer was cached.) Fixes bug + 5723; bugfix on 0.2.3.1-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 03558e5..5ef56a6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2745,7 +2745,7 @@ tell_controller_about_resolved_result(entry_connection_t *conn, answer_type == RESOLVED_TYPE_HOSTNAME)) { return; /* we already told the controller. */ } else if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { - char *cp = tor_dup_ip(get_uint32(answer)); + char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, cp, expires, NULL); tor_free(cp);

1 0

r25635: {} the slides from my 28c3-derivative talk at montreal this wee (projects/presentations)
by Roger Dingledine 01 May '12

01 May '12

Author: arma Date: 2012-05-01 19:09:42 +0000 (Tue, 01 May 2012) New Revision: 25635 Added: projects/presentations/2012-04-28-montreal.odp projects/presentations/2012-04-28-montreal.pdf Log: the slides from my 28c3-derivative talk at montreal this weekend most useful for adding an intro to tor, and updating the graphs Added: projects/presentations/2012-04-28-montreal.odp =================================================================== (Binary files differ) Property changes on: projects/presentations/2012-04-28-montreal.odp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2012-04-28-montreal.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2012-04-28-montreal.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 01 May '12

01 May '12

commit 5c0a20958ee841e730b9ac10d18f59b5370a2b21 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 1 18:15:12 2012 +0000 Update translations for vidalia_alpha --- de/vidalia_de.po | 106 +++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/de/vidalia_de.po b/de/vidalia_de.po index 0ccf058..d1b4e95 100644 --- a/de/vidalia_de.po +++ b/de/vidalia_de.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-22 09:01+0000\n" -"Last-Translator: Sacro <Scion(a)T-Online.de>\n" +"PO-Revision-Date: 2012-05-01 17:49+0000\n" +"Last-Translator: talion <talion(a)caldron.de>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2009,13 +2009,13 @@ msgstr "" msgctxt "MainWindow" msgid "Panic is enabled" -msgstr "" +msgstr "Panikmodus aktiviert" msgctxt "MainWindow" msgid "" "<b>WARNING:</b> The Panic button is enabled. Use it carefully because it " "will remove Tor completely." -msgstr "" +msgstr "<b>ACHTUNG:</b> Der Panik Knopf ist aktiviert. Verwende ihn vorsichtig, denn er entfernt Tor vollständig von deinem PC." msgctxt "MainWindow" msgid "New Circuit" @@ -2035,17 +2035,17 @@ msgstr "" msgctxt "MainWindow" msgid "Plugins" -msgstr "" +msgstr "Erweiterungen" msgctxt "MainWindow" msgid "Your clock is wrong" -msgstr "" +msgstr "Deine Uhr geht falsch" msgctxt "MainWindow" msgid "" "Your computer's clock is wrong, tor may not work as expected. Please check " "the Message Log for more information." -msgstr "" +msgstr "Deine Computeruhr geht falsch, daher funktioniert Tor möglicherweise nicht wie erwartet. Nähere Informationen können im Nachrichten Log enthalten sein." msgctxt "MainWindow" msgid "" @@ -2053,7 +2053,7 @@ msgid "" "\n" "Here's the last error message:\n" " %2" -msgstr "" +msgstr "Vidalia kann keine Verbindung zu Tor aufbauen, weil es nicht auf folgende Datei zugreifen kann: %1\n\nDies ist die aktuellste Fehlermeldung:\n %2" msgctxt "MainWindow" msgid "" @@ -2082,17 +2082,17 @@ msgstr "fehlgeschlagen (%1)" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(wahrscheinlich Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(wahrscheinlich ein Emailprogramm)" msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "Eine deiner Anwendungen %1 scheint eine möglicherweise unverschlüsselte und unsichere Verbindung zu Port %2 aufzubauen." msgctxt "MainWindow" msgid "" @@ -2517,13 +2517,13 @@ msgstr "Status" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" -msgstr "" +msgstr "<a href=\"server.offline\">Warum ist mein Relay offline?</a>" msgctxt "NetViewer" msgid "" "If your relay isn't listed among the others, it may be because it doesn't " "have a Running flag yet. <a href=\"server.consensus\">What's this?</a>" -msgstr "" +msgstr "Wenn dein Relay hier nicht aufgelistet ist, könnte es daran liegen, dass es noch keine 'Running' Markierung besitzt. <a href=\"server.consensus\">Was ist das?</a>" msgctxt "NetViewer" msgid "Exit circuits" @@ -2675,69 +2675,69 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Du musst eine oder mehrere Bridges angeben." msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file." -msgstr "" +msgstr "WARNUNG: %1 besitzt keine info Datei." msgctxt "PluginWrapper" msgid "%1: Processing..." -msgstr "" +msgstr "%1: wird verarbeitet..." msgctxt "PluginWrapper" msgid "" "%4: ERROR: Line: %1 - Column: %2\n" "%3" -msgstr "" +msgstr "%4: FEHLER: Zeile: %1 - Spalte: %2\n%3" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" -msgstr "" +msgstr "%1: Fehler: Datei %2 kann nicht geöffnet werden" msgctxt "PluginWrapper" msgid "%2: ERROR: Cannot open %1" -msgstr "" +msgstr "%2: FEHLER: %1 kann nicht geöffnet werden" msgctxt "PluginWrapper" msgid "%2: ERROR: Parsing %1" -msgstr "" +msgstr "%2: FEHLER: Einlesen von %1" msgctxt "PluginWrapper" msgid "" "Line: %1 - Column: %2\n" "Message: %3" -msgstr "" +msgstr "Zeile: %1 - Spalte: %2\nNachricht: %3" msgctxt "PluginWrapper" msgid "%1: Starting..." -msgstr "" +msgstr "%1: wird gestartet..." msgctxt "PluginWrapper" msgid "%1: Stoping..." -msgstr "" +msgstr "%1: wird gestoppt..." msgctxt "PluginWrapper" msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" -msgstr "" +msgstr "%1: WARNUNG: keine grafische Oberfläche vorhanden, aber buildGUI() wurde aufgerufen" msgctxt "PluginWrapper" msgid "" "%2:\n" "*** Exception in line %1" -msgstr "" +msgstr "*** Ausnahmefehler in Zeile %1" msgctxt "PluginWrapper" msgid "*** Backtrace:" -msgstr "" +msgstr "*** Ablaufverfolgung" msgctxt "PluginWrapper" msgid "(untitled)" -msgstr "" +msgstr "(ohne Namen)" msgctxt "PluginWrapper" msgid "Error: buildGUI() failed for plugin %1" -msgstr "" +msgstr "Fehler: buildGUI() fehlgeschlagen für Plugin %1" msgctxt "Policy" msgid "accept" @@ -2749,33 +2749,33 @@ msgstr "ablehnen" msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "QObject" msgid "There were some settings that Vidalia wasn't able to apply together" -msgstr "" +msgstr "Vidalia konnte nicht alle Einstellungen übernehmen" msgctxt "QObject" msgid "" "Failed to set %1:\n" "Reason: %2" -msgstr "" +msgstr "%1 konnte nicht gesetzt werden:\nBegründung: %2" msgctxt "QObject" msgid "" "The failed options were saved in your torrc and will be applied when you " "restart." -msgstr "" +msgstr "Die fehlgeschlagenen Einstellungen wurden in deiner torrc gespeichert und werden beim nächsten Start aktiviert." msgctxt "QObject" msgid "" "The failed options were NOT saved in your torrc and will be applied when you" " restart." -msgstr "" +msgstr "Die fehlgeschlagenen Einstellungen wurden NICHT in deiner torrc gespeichert und werden beim nächsten Start aktiviert." msgctxt "QObject" msgid "Vidalia was unable to save the options to the torrc file." -msgstr "" +msgstr "Vidala konnte diese Einstellung nicht in der torrc Datei speichern." msgctxt "RouterDescriptor" msgid "Online" @@ -3209,59 +3209,59 @@ msgstr "Kontakt E-Mail-Adresse, über welche du im Falle eines Problemes informi msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "Tag" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "Woche" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "Monat" msgctxt "ServerPage" msgid "Enable accounting" -msgstr "" +msgstr "Buchführung aktivieren" msgctxt "ServerPage" msgid "h:mm" -msgstr "" +msgstr "h:mm" msgctxt "ServerPage" msgid "at" -msgstr "" +msgstr "um" msgctxt "ServerPage" msgid "per" -msgstr "" +msgstr "pro" msgctxt "ServerPage" msgid "bytes" -msgstr "" +msgstr "bytes" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "Drücken Sie nicht häufiger als " msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "Uhrzeit" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3568,19 +3568,19 @@ msgstr "Vidalia hat Tor nicht gestartet. Du musst Tor mit den Interface stoppen, msgctxt "TorControl" msgid "Start failed: %1" -msgstr "" +msgstr "Start fehlgeschlagen: %1" msgctxt "TorControl" msgid "Process finished: ExitCode=%1" -msgstr "" +msgstr "Prozess beendet: ExitCode=%1" msgctxt "TorControl" msgid "Connection failed: %1" -msgstr "" +msgstr "Verbindung fehlgeschlagen: %1" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "Verbindung getrennt" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" @@ -3880,7 +3880,7 @@ msgstr "Konnte Nachrichtendatei nicht öffnen '%1': %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "Wert benötigt für Parameter :" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 01 May '12

01 May '12

commit cd8d314f6c0ee0e4b416a265b5374643d06abec4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 1 17:45:26 2012 +0000 Update translations for whisperback_completed --- de/de.po | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 248 insertions(+), 0 deletions(-) diff --git a/de/de.po b/de/de.po new file mode 100644 index 0000000..0ff90ea --- /dev/null +++ b/de/de.po @@ -0,0 +1,248 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <pompor(a)web.de>, 2012. +# <skep(a)riseup.net>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 22:33+0100\n" +"PO-Revision-Date: 2012-05-01 17:28+0000\n" +"Last-Translator: talion <talion(a)caldron.de>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "Ungültige Kontakt-Adresse: %s" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "Ungültiger Kontakt OpenPGP Schlüssel: %s" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "Invalid contact OpenPGP public key block" + +#: ../whisperBack/encryption.py:126 +msgid "No keys found." +msgstr "Keine Schlüssel gefunden" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The variable %s was not found in any of the configuation " +"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "Die Variable %s wurde in keiner Konfiguration gefunden files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "Name der betroffenen Software" + +#: ../whisperBack/gui.py:115 +msgid "Exact steps to reproduce the problem" +msgstr "Genaue Schritte um das Problem zu reproduzieren" + +#: ../whisperBack/gui.py:116 +msgid "Actual result / the problem" +msgstr "Tatsächliches Ergebnis / das Problem" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "Gewünschtes Ergebnis" + +#: ../whisperBack/gui.py:155 +msgid "Unable to load a valid configuration." +msgstr "Es konnte keine gültige Konfiguration geladen werden." + +#: ../whisperBack/gui.py:177 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" +"<p><strong>Do not include more personal information than\n" +"needed!</strong></p>\n" +"<h2>About giving us an email address</h2>\n" +"<p>If you don't mind disclosing some bits of your identity\n" +"to Tails developers, you can provide an email address to\n" +"let us ask more details about the bug. Additionally entering\n" +"a public PGP key enables us to encrypt such future\n" +"communication.</p>\n" +"<p>Anyone who can see this reply will probably infer you are\n" +"a Tails user. Time to wonder how much you trust your\n" +"Internet and mailbox providers?</p>\n" +msgstr "<h1>Hilf uns den Fehler zu beheben!</h1>\n<p>Lies <a href=\"%s\">unsere Anleitung zur Fehlerberichterstattung</a>.</p>\n<p><strong>Geben Sie nicht mehr persönliche Informationen an als benötigt!</strong></p>\n<h2>Über die Angabe einer Emailadresse</h2>\n<p>Wenn es Sie nicht stört, Teile Ihrer Identität gegenüber den Tails Entwicklern offenzulegen,\nkönnen Sie eine Emailadresse für Rückfragen angeben.\nEin zusätzlich angegebener PGP Schlüssel ermöglicht uns in Zukunft eine verschlüsselete Kommunikation.</p>\n<p>Jeder, der diese Antwort sehen kann, kann wahrscheinlich daraus folgern,\ndass Sie ein Tails Nutzer sind. Zeit sich zu fragen, wie sehr\nSie Ihrem Internet und Emailprovider vertrauen?</p>\n" + +#: ../whisperBack/gui.py:229 +msgid "Sending mail..." +msgstr "Mail wird gesendet..." + +#: ../whisperBack/gui.py:230 +msgid "Sending mail" +msgstr "Mail wird gesendet" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:232 +msgid "This could take a while..." +msgstr "Dies könnte eine Weile dauern..." + +#: ../whisperBack/gui.py:246 +msgid "The contact email adress doesn't seem valid." +msgstr "Die Kontakt-Adresse ist nicht gültig." + +#: ../whisperBack/gui.py:263 +msgid "Unable to send the mail: SMTP error." +msgstr "Mail kann nicht gesendet werden: SMTP Fehler." + +#: ../whisperBack/gui.py:265 +msgid "Unable to connect to the server." +msgstr "Verbindung zum Server fehlgeschlagen." + +#: ../whisperBack/gui.py:267 +msgid "Unable to create or to send the mail." +msgstr "EMail kann nicht erstellt oder versendet werden." + +#: ../whisperBack/gui.py:270 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "\n\nDie Fehlermeldung konnte aufgrund von Netzwerkproblemen nicht gesendet werden. Bitte verbinden sich sich mit dem Netzwerk und klicken erneut auf senden.\n\nSollte dies nicht funktionieren, bieten wie ihnen an, die Fehlermeldung zu speichern." + +#: ../whisperBack/gui.py:283 +msgid "Your message has been sent." +msgstr "Ihre Nachricht wurde versendet." + +#: ../whisperBack/gui.py:289 +msgid "Unable to find encryption key." +msgstr "Verschlüsselungs Key konnte nicht gefunden werden." + +#: ../whisperBack/gui.py:293 +msgid "An error occured during encryption." +msgstr "Ein Fehler trat beim Verschlüsseln auf." + +#: ../whisperBack/gui.py:313 +#, python-format +msgid "Unable to save %s." +msgstr "%s kann nicht gespeichert werden." + +#. XXX: fix string +#: ../whisperBack/gui.py:337 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "Die Fehlermeldung konnte aufgrund von Netzwerkproblemen nicht gesendet werden. Als Umgehungslösung können Sie die Fehlermeldung auf einem USB-Stick speichern und versuchen, Sie uns per Email an %s zu senden. Bedenken Sie, dass dieser Fehlerbericht so nicht anonymus sein wird, es sei denn, Sie unternehmen dazu weitere Schritte (z.b. die Verwendung einer Wegwerf-Emailadresse in Verbindung mit Tor).\n\nMöchten Sie diesen Fehlerbericht in eine Datei speichern?" + +#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +msgid "WhisperBack" +msgstr "WhisperBack" + +#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +msgid "Send feedback in an encrypted mail." +msgstr "Senden Sie ihr Feedback in einer verschlüsselten Mail." + +#: ../whisperBack/gui.py:405 +msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" +msgstr "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" + +#: ../whisperBack/gui.py:406 +msgid "Tails developers <tails(a)boum.org>" +msgstr "Tails developers <tails(a)boum.org>" + +#: ../whisperBack/gui.py:407 +msgid "translator-credits" +msgstr "Übersetzer Danksagung" + +#: ../whisperBack/gui.py:434 +msgid "This doesn's seem to be a valid URL or OpenPGP key." +msgstr "Die URL oder der OpenPGP Key ist ungültig." + +#: ../data/whisperback.ui.h:1 +msgid "" +"Add a PGP key if you want us to encrypt messages when we respond to you." +msgstr "Fügen Sie einen PGP key an, wenn Sie wollen, dass wir Ihnen verschlüsselt antworten." + +#: ../data/whisperback.ui.h:2 +msgid "Bug description" +msgstr "Fehler Beschreibung" + +#: ../data/whisperback.ui.h:3 +msgid "Copyright © 2009-2011 tails(a)boum.org" +msgstr "Copyright © 2009-2011 tails(a)boum.org" + +#: ../data/whisperback.ui.h:4 +msgid "Help" +msgstr "Hilfe" + +#: ../data/whisperback.ui.h:5 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "Wenn sie wollen, dass wir Ihnen mit einer verschlüsselten Nachricht antworten, hängen Sie Ihre Schlüssel ID, einen Link zu Ihrem Schlüssel oder den Schlüssel alsPublic Key Block:" + +#: ../data/whisperback.ui.h:6 +msgid "Optional email address to contact you" +msgstr "Optionale Kontakt Adresse" + +#: ../data/whisperback.ui.h:7 +msgid "Send" +msgstr "Senden" + +#: ../data/whisperback.ui.h:9 +msgid "Summary" +msgstr "Zusammenfassung" + +#: ../data/whisperback.ui.h:10 +msgid "Technical details to include" +msgstr "Technische Details" + +#: ../data/whisperback.ui.h:12 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - Senden Sie Ihre Rückmeldungen per verschlüsselter Email\nCopyright (C) 2009-2011 Tails Entwickler <tails(a)boum.org>\n\nEine inoffizielle Übersetzung der folgenden Lizenz finden Sie unter\nhttp://www.gnu.de/documents/gpl.de.html\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 3 of the License, or (at\nyour option) any later version.\n\nThis program is distributed in the hope that it will be useful, but\nWITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see <http://www.gnu.org/licenses/>.\n" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "Informationen zur Fehlersuche" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "Kopfzeilen" + +#: ../data/whisperback.ui.h:30 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" + +#: ../data/whisperback.ui.h:31 +msgid "optional PGP key" +msgstr "Optionaler PGP Schlüssel"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 01 May '12

01 May '12

commit 592900d4397fe4891644539a426c5d8663bb6eaa Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 1 17:45:25 2012 +0000 Update translations for whisperback --- de/de.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/de/de.po b/de/de.po index bf495f5..0ff90ea 100644 --- a/de/de.po +++ b/de/de.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2012-03-14 22:02+0000\n" -"Last-Translator: skep <skep(a)riseup.net>\n" +"PO-Revision-Date: 2012-05-01 17:28+0000\n" +"Last-Translator: talion <talion(a)caldron.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +81,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "" +msgstr "<h1>Hilf uns den Fehler zu beheben!</h1>\n<p>Lies <a href=\"%s\">unsere Anleitung zur Fehlerberichterstattung</a>.</p>\n<p><strong>Geben Sie nicht mehr persönliche Informationen an als benötigt!</strong></p>\n<h2>Über die Angabe einer Emailadresse</h2>\n<p>Wenn es Sie nicht stört, Teile Ihrer Identität gegenüber den Tails Entwicklern offenzulegen,\nkönnen Sie eine Emailadresse für Rückfragen angeben.\nEin zusätzlich angegebener PGP Schlüssel ermöglicht uns in Zukunft eine verschlüsselete Kommunikation.</p>\n<p>Jeder, der diese Antwort sehen kann, kann wahrscheinlich daraus folgern,\ndass Sie ein Tails Nutzer sind. Zeit sich zu fragen, wie sehr\nSie Ihrem Internet und Emailprovider vertrauen?</p>\n" #: ../whisperBack/gui.py:229 msgid "Sending mail..." @@ -147,11 +147,11 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "" +msgstr "Die Fehlermeldung konnte aufgrund von Netzwerkproblemen nicht gesendet werden. Als Umgehungslösung können Sie die Fehlermeldung auf einem USB-Stick speichern und versuchen, Sie uns per Email an %s zu senden. Bedenken Sie, dass dieser Fehlerbericht so nicht anonymus sein wird, es sei denn, Sie unternehmen dazu weitere Schritte (z.b. die Verwendung einer Wegwerf-Emailadresse in Verbindung mit Tor).\n\nMöchten Sie diesen Fehlerbericht in eine Datei speichern?" #: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 msgid "WhisperBack" -msgstr "" +msgstr "WhisperBack" #: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 msgid "Send feedback in an encrypted mail." @@ -167,7 +167,7 @@ msgstr "Tails developers <tails(a)boum.org>" #: ../whisperBack/gui.py:407 msgid "translator-credits" -msgstr "" +msgstr "Übersetzer Danksagung" #: ../whisperBack/gui.py:434 msgid "This doesn's seem to be a valid URL or OpenPGP key." @@ -202,7 +202,7 @@ msgstr "Optionale Kontakt Adresse" #: ../data/whisperback.ui.h:7 msgid "Send" -msgstr "" +msgstr "Senden" #: ../data/whisperback.ui.h:9 msgid "Summary" @@ -229,15 +229,15 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" +msgstr "WhisperBack - Senden Sie Ihre Rückmeldungen per verschlüsselter Email\nCopyright (C) 2009-2011 Tails Entwickler <tails(a)boum.org>\n\nEine inoffizielle Übersetzung der folgenden Lizenz finden Sie unter\nhttp://www.gnu.de/documents/gpl.de.html\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 3 of the License, or (at\nyour option) any later version.\n\nThis program is distributed in the hope that it will be useful, but\nWITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "" +msgstr "Informationen zur Fehlersuche" #: ../data/whisperback.ui.h:29 msgid "headers" -msgstr "" +msgstr "Kopfzeilen" #: ../data/whisperback.ui.h:30 msgid "https://tails.boum.org/"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 May '12

01 May '12

commit d031043a7e63003577841ead3ffa8102317a3f2d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 1 16:15:29 2012 +0000 Update translations for https_everywhere_completed --- de/ssl-observatory.dtd | 76 ++++++++++++++++++++++-------------------------- 1 files changed, 35 insertions(+), 41 deletions(-) diff --git a/de/ssl-observatory.dtd b/de/ssl-observatory.dtd index 6fbd4d7..51fdea5 100644 --- a/de/ssl-observatory.dtd +++ b/de/ssl-observatory.dtd @@ -1,11 +1,9 @@  -<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> -<!ENTITY ssl-observatory.popup.later "Ask Me Later"> -<!ENTITY ssl-observatory.popup.no "No"> +<!ENTITY ssl-observatory.popup.details "Details und Datenschutz Informationen"> +<!ENTITY ssl-observatory.popup.later "Später nachfragen"> +<!ENTITY ssl-observatory.popup.no "Nein"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks -against your browser by sending the certificates you receive to the -Observatory. Turn this on?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere kann Angriffe gegen Ihren Browser erkennen, indem es Zertifikate, die Sie empfangen, zum SSL Observatory sendet. Einstellung aktivieren?">  <!ENTITY ssl-observatory.popup.title -"Should HTTPS Everywhere use the SSL Observatory?"> +"Soll HTTPS Everywhere SSL Observatory benutzen?"> -<!ENTITY ssl-observatory.popup.yes "Yes"> +<!ENTITY ssl-observatory.popup.yes "Ja">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"It is safe to enable this, unless you use a very -intrusive corporate network:"> +"Es ist sicher, diese Option zu aktivieren, es sei denn, Sie benutzen ein sehr aufdringliches Firmennetzwerk:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Safe, unless you use a corporate network with secret intranet server names:"> +"Sicher, es sei denn, Sie benutzen ein Firmennetzwerk mit geheimen Intranet Servernamen:"> <!ENTITY ssl-observatory.prefs.alt_roots -"Submit and check certificates signed by non-standard root CAs"> +"Sende und überprüfe Zertifikate, die nicht von Stammzertifizierungsstellen ausgestellt wurden"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> +"Es ist sicher (und eine gute Idee), diese Option zu aktivieren, es sei denn, Sie benutzen ein aufdringliches Firmennetzwerk, oder Kaspersky Antiviren-Software, die Sie beim Browsen mittels eines TLS Proxyservers und einer privaten Zertifizierungsstelle überwacht. Wenn diese Option in einem solchen Netzwerk verwendet wird, könnte Sie Hinweise (in Form der dadurch erstellten eindeutigen Zertifikate) auf die durch diesen Proxyserver besuchten https:// Domains hinterlassen."> -<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous "Überprüfe Zertifikate, die Tor für Anonymität benutzt"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Check certificates using Tor for anonymity (requires Torbutton)"> +"Üerprüfte Zertifikate, die Tor für Anonymität benutzt (benötigt Torbutton)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"This option requires Tor and Torbutton to be installed"> +"Diese Option macht die Installation von Tor und Torbutton erforderlich"> <!ENTITY ssl-observatory.prefs.asn -"When you see a new certificate, tell the Observatory which ISP you are connected to"> +"Dem SSL Observatory mitteilen, welchen ISP Sie verwenden, wenn Sie ein neues Zertifikat zu sehen bekommen"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> +"Diese Option verwendet die 'Autonome System Zahl' Ihres Netzwerks. Das hilft uns, Angriffe gegen HTTPS zu orten und festzustellen, ob es sich um Angriffe von Netzwerken in Ländern wie Iran und Syrien handelt, in denen solche Angriffe vergleichsweise häufig sind."> -<!ENTITY ssl-observatory.prefs.done "Done"> +<!ENTITY ssl-observatory.prefs.done "Fertig"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) -sends copies of HTTPS certificates to the Observatory, to help us -detect 'man in the middle' attacks and improve the Web's security; and (2) -lets us warn you about insecure connections or attacks on your browser."> +"HTTPS Everywhere kann EFF's SSL Observatory verwenden. Das ermöglicht uns 1. die Erkennung von 'man in the middle' Angriffen und damit eine Verbesserung der Internetsicherheit, indem Kopien der HTTPS Zertifikate an das SSL Observatory gesendet werden; und 2. können wir Sie bei unsicheren Verbindungen oder Angriffen gegen Ihren Browser warnen.">  <!ENTITY ssl-observatory.prefs.explanation2 -"For example, when you visit https://www.something.com, the certificate -received by the Observatory will indicate that somebody visited -www.something.com, but not who visited the site, or what specific page they -looked at. Mouseover the options for further details:"> +"Beispiel: Wenn Sie https://www.irgendetwas.com besuchen, kann das SSL Observatory lediglich feststellen, dass irgendjemand www.irgendetwas.com besucht hat, aber nicht wer es war oder welche genaue Informationen aufgerufen wurde. Für mehr Informationen, fahren Sie mit der Maus über diese Option:"> -<!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> +<!ENTITY ssl-observatory.prefs.hide "Verstecke erweiterte Optionen"> <!ENTITY ssl-observatory.prefs.nonanon -"Check certificates even if Tor is not available"> +"Zertifikate auch überprüfen, wenn Tor nicht verfügbar ist"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"We will still try to keep the data anonymous, but this option is less secure"> +"Wir bemühen uns, die Daten dennoch anonym zu halten, aber diese Option ist weniger sicher."> <!ENTITY ssl-observatory.prefs.priv_dns -"Submit and check certificates for non-public DNS names"> +"Zertifikate für nicht-öffentliche DNS-Namen Senden und Überprüfen"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> +"Wenn diese Option nicht aktiviert ist, wird das Observatory keine Zertifikate für Domain Namen aufnehmen, die es nicht über das DNS-System auflösen kann."> -<!ENTITY ssl-observatory.prefs.show "Show advanced options"> +<!ENTITY ssl-observatory.prefs.show "Zeige erweiterte Optionen"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> - -<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> -<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> -<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> -<!ENTITY ssl-observatory.warning.okay "I understand"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> +<!ENTITY ssl-observatory.prefs.title "SSL Observatory Einstellungen"> +<!ENTITY ssl-observatory.prefs.use "SSL Observatory verwenden?"> +<!ENTITY ssl-observatory.warning.title "WARNUNG von EFF's SSL Observatory"> +<!ENTITY ssl-observatory.warning.showcert "Zertifikatskette anzeigen"> +<!ENTITY ssl-observatory.warning.okay "Ich verstehe"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory hat eine Warnung zu dem HTTPS Zertifikat dieser Seite veröffentlicht:"> +<!ENTITY ssl-observatory.warning.defense "Wenn Sie auf dieser Seite eingeloggt sind, kann es empfehlenswert sein, das Passwort zu ändern, sobald Sie eine sichere Verbindung haben."> +<!ENTITY ssl-observatory.prefs.self_signed +"Selbstsignierte Zertifikate Senden und Überprüfen"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"Empfehlenswert; kryptographische Probleme sind in selbstsignierten eingebetteten Geräten besonders häufig.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 May '12

01 May '12

commit e45a97eb2cfe050f64ed8e21044832a457cbf0de Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 1 16:15:27 2012 +0000 Update translations for https_everywhere --- de/ssl-observatory.dtd | 53 ++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/de/ssl-observatory.dtd b/de/ssl-observatory.dtd index e4ea329..51fdea5 100644 --- a/de/ssl-observatory.dtd +++ b/de/ssl-observatory.dtd @@ -1,11 +1,9 @@  <!ENTITY ssl-observatory.popup.details "Details und Datenschutz Informationen"> -<!ENTITY ssl-observatory.popup.later "Frage mich später"> +<!ENTITY ssl-observatory.popup.later "Später nachfragen"> <!ENTITY ssl-observatory.popup.no "Nein"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks -against your browser by sending the certificates you receive to the -Observatory. Turn this on?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere kann Angriffe gegen Ihren Browser erkennen, indem es Zertifikate, die Sie empfangen, zum SSL Observatory sendet. Einstellung aktivieren?">   <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -"It is safe to enable this, unless you use a very -intrusive corporate network:"> +"Es ist sicher, diese Option zu aktivieren, es sei denn, Sie benutzen ein sehr aufdringliches Firmennetzwerk:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -"Sicher, außer sie benutzen ein Firmennetzwerk mit geheimen Intranet Servernamen:"> +"Sicher, es sei denn, Sie benutzen ein Firmennetzwerk mit geheimen Intranet Servernamen:"> <!ENTITY ssl-observatory.prefs.alt_roots "Sende und überprüfe Zertifikate, die nicht von Stammzertifizierungsstellen ausgestellt wurden"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -""> +"Es ist sicher (und eine gute Idee), diese Option zu aktivieren, es sei denn, Sie benutzen ein aufdringliches Firmennetzwerk, oder Kaspersky Antiviren-Software, die Sie beim Browsen mittels eines TLS Proxyservers und einer privaten Zertifizierungsstelle überwacht. Wenn diese Option in einem solchen Netzwerk verwendet wird, könnte Sie Hinweise (in Form der dadurch erstellten eindeutigen Zertifikate) auf die durch diesen Proxyserver besuchten https:// Domains hinterlassen."> -<!ENTITY ssl-observatory.prefs.anonymous "Überprüfe Zertifikate, die Tor für anonymität benutzen"> +<!ENTITY ssl-observatory.prefs.anonymous "Überprüfe Zertifikate, die Tor für Anonymität benutzt"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -""> +"Üerprüfte Zertifikate, die Tor für Anonymität benutzt (benötigt Torbutton)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -""> +"Diese Option macht die Installation von Tor und Torbutton erforderlich"> <!ENTITY ssl-observatory.prefs.asn -""> +"Dem SSL Observatory mitteilen, welchen ISP Sie verwenden, wenn Sie ein neues Zertifikat zu sehen bekommen"> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"Diese Option verwendet die 'Autonome System Zahl' Ihres Netzwerks. Das hilft uns, Angriffe gegen HTTPS zu orten und festzustellen, ob es sich um Angriffe von Netzwerken in Ländern wie Iran und Syrien handelt, in denen solche Angriffe vergleichsweise häufig sind."> <!ENTITY ssl-observatory.prefs.done "Fertig"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere kann EFF's SSL Observatory verwenden. Das ermöglicht uns 1. die Erkennung von 'man in the middle' Angriffen und damit eine Verbesserung der Internetsicherheit, indem Kopien der HTTPS Zertifikate an das SSL Observatory gesendet werden; und 2. können wir Sie bei unsicheren Verbindungen oder Angriffen gegen Ihren Browser warnen.">  <!ENTITY ssl-observatory.prefs.explanation2 -""> +"Beispiel: Wenn Sie https://www.irgendetwas.com besuchen, kann das SSL Observatory lediglich feststellen, dass irgendjemand www.irgendetwas.com besucht hat, aber nicht wer es war oder welche genaue Informationen aufgerufen wurde. Für mehr Informationen, fahren Sie mit der Maus über diese Option:"> <!ENTITY ssl-observatory.prefs.hide "Verstecke erweiterte Optionen"> <!ENTITY ssl-observatory.prefs.nonanon -""> +"Zertifikate auch überprüfen, wenn Tor nicht verfügbar ist"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -""> +"Wir bemühen uns, die Daten dennoch anonym zu halten, aber diese Option ist weniger sicher."> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"Zertifikate für nicht-öffentliche DNS-Namen Senden und Überprüfen"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"Wenn diese Option nicht aktiviert ist, wird das Observatory keine Zertifikate für Domain Namen aufnehmen, die es nicht über das DNS-System auflösen kann."> -<!ENTITY ssl-observatory.prefs.show "Zeige erweiterte OptionenI"> +<!ENTITY ssl-observatory.prefs.show "Zeige erweiterte Optionen"> -<!ENTITY ssl-observatory.prefs.title ""> +<!ENTITY ssl-observatory.prefs.title "SSL Observatory Einstellungen"> -<!ENTITY ssl-observatory.prefs.use ""> -<!ENTITY ssl-observatory.warning.title ""> -<!ENTITY ssl-observatory.warning.showcert ""> +<!ENTITY ssl-observatory.prefs.use "SSL Observatory verwenden?"> +<!ENTITY ssl-observatory.warning.title "WARNUNG von EFF's SSL Observatory"> +<!ENTITY ssl-observatory.warning.showcert "Zertifikatskette anzeigen"> <!ENTITY ssl-observatory.warning.okay "Ich verstehe"> -<!ENTITY ssl-observatory.warning.text ""> -<!ENTITY ssl-observatory.warning.defense ""> +<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory hat eine Warnung zu dem HTTPS Zertifikat dieser Seite veröffentlicht:"> +<!ENTITY ssl-observatory.warning.defense "Wenn Sie auf dieser Seite eingeloggt sind, kann es empfehlenswert sein, das Passwort zu ändern, sobald Sie eine sichere Verbindung haben."> <!ENTITY ssl-observatory.prefs.self_signed -""> +"Selbstsignierte Zertifikate Senden und Überprüfen"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -""> +"Empfehlenswert; kryptographische Probleme sind in selbstsignierten eingebetteten Geräten besonders häufig.">

1 0

r25634: {website} Adding Julien's GSoC application as an example (website/trunk/about/en)
by Damian Johnson 01 May '12

01 May '12

Author: atagar Date: 2012-05-01 15:49:46 +0000 (Tue, 01 May 2012) New Revision: 25634 Modified: website/trunk/about/en/gsoc.wml Log: Adding Julien's GSoC application as an example Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2012-05-01 03:12:10 UTC (rev 25633) +++ website/trunk/about/en/gsoc.wml 2012-05-01 15:49:46 UTC (rev 25634) @@ -228,6 +228,7 @@ <ul> <li><h4><a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> by Ravi Padmala</h4></li> <li><h4><a href="http://feroze.in/gsoc12.html">Implementing Hidden Service Configuration and Bandwidth Scheduling Plugins</a> by Feroze Naina</h4></li> + <li><h4><a href="http://dustri.org/pub/tails_server.pdf">Tails Server</a> by Julien Voisin</h4></li> <li><h4><a href="../about/gsocProposal/gsoc10-proposal-soat.txt">SOAT Expansion</a> by John Schanck</h4></li> <li><h4><a href="http://inspirated.com/uploads/tor-gsoc-11.pdf">GTK+ Frontend and Client Mode Improvements for arm</a> by Kamran Khan</h4></li> <li><h4><a href="http://www.gsathya.in/gsoc11.html">Orbot + ORLib</a> by Sathya Gunasekaran</h4></li>

1 0