[tbb-commits] [tor-browser/tor-browser-45.5.1esr-6.0-1] squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

[gk at torproject.org]

commit 2c396200c8c659c6e2c3ab8e40851aa984da49eb
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Nov 29 09:43:16 2016 +0000

    squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter;  remove Amazon, eBay, bing
    
    This fixes bug 20809: the DuckDuckGo team has changed its server-side
    code in a way that lets users with JavaScript enabled use the default
    landing page while those without JavaScript available get redirected
    directly to the non-JS page. We adapt the search engine URLs
    accordingly.
---
 browser/locales/en-US/searchplugins/ddg-onion.xml | 4 ++--
 browser/locales/en-US/searchplugins/ddg.xml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/locales/en-US/searchplugins/ddg-onion.xml b/browser/locales/en-US/searchplugins/ddg-onion.xml
index 009da7e..a1f6a28 100644
--- a/browser/locales/en-US/searchplugins/ddg-onion.xml
+++ b/browser/locales/en-US/searchplugins/ddg-onion.xml
@@ -3,9 +3,9 @@
 <Description>Duck Duck Go Onion</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamq
 JDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image>
-<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion/html/">
+<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion">
   <Param name="q" value="{searchTerms}"/>
 </Url>
-<SearchForm>http://3g2upl4pq6kufc4m.onion/html/</SearchForm>
+<SearchForm>http://3g2upl4pq6kufc4m.onion</SearchForm>
 </SearchPlugin>
 
diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml
index 8318746..acf4c41 100644
--- a/browser/locales/en-US/searchplugins/ddg.xml
+++ b/browser/locales/en-US/searchplugins/ddg.xml
@@ -22,9 +22,9 @@ AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA
 AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA
 AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD
 AADwDwAA+B8AAA==</Image>
-<Url type="text/html" method="POST" template="https://duckduckgo.com/html">
+<Url type="text/html" method="POST" template="https://duckduckgo.com">
   <Param name="q" value="{searchTerms}"/>
 </Url>
-<SearchForm>https://duckduckgo.com/</SearchForm>
+<SearchForm>https://duckduckgo.com</SearchForm>
 </SearchPlugin>