[tor-commits] [onionoo/master] Take out old news.

2014-06-17 Thread karsten 
commit 6a668169886aeb7fc242c8dc8283df223a4780e4
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Tue Jun 17 09:17:42 2014 +0200

Take out old news.
---
 web/index.html |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/web/index.html b/web/index.html
index ebb675a..9777042 100644
--- a/web/index.html
+++ b/web/index.html
@@ -300,7 +300,7 @@ Lookups are case-insensitive.
 /li
 
 li
-font color=bluebfingerprint/b/font
+bfingerprint/b
 p
 Return only the relay with the parameter value matching the fingerprint
 or the bridge with the parameter value matching the hashed fingerprint.
@@ -311,7 +311,6 @@ with two exceptions:
 not/i be hashed (again) using SHA-1;
 (2) the response will contain any matching relay or bridge regardless of
 whether they have been running in the past week.
-font color=blueAdded on April 20, 2014./font
 /p
 /li
 
@@ -1495,7 +1494,6 @@ The unit is bytes per second.
 Contained graph history objects may contain null values if the relay did
 not provide any bandwidth data or only data for less than 20% of a given
 time period.
-font color=redAs of April 20, 2014, this field is optional./font
 /p
 /li
 
@@ -1508,7 +1506,6 @@ Object containing graph history objects with read bytes 
for different time
 periods.
 The specification of graph history objects is similar to those in the
 strongwrite_history/strong field.
-font color=redAs of April 20, 2014, this field is optional./font
 /p
 /li
 
@@ -1541,7 +1538,6 @@ Object containing graph history objects with written 
bytes for different
 time periods.
 The specification of graph history objects is similar to those in the
 strongwrite_history/strong field of strongrelays/strong.
-font color=redAs of April 20, 2014, this field is optional./font
 /p
 /li
 
@@ -1554,7 +1550,6 @@ Object containing graph history objects with read bytes 
for different time
 periods.
 The specification of graph history objects is similar to those in the
 strongwrite_history/strong field of strongrelays/strong.
-font color=redAs of April 20, 2014, this field is optional./font
 /p
 /li
 
@@ -1743,7 +1738,6 @@ The specification of this history object is similar to 
that in the
 /h3
 
 p
-font color=blueAdded on March 10, 2014./font
 Clients documents contain estimates of the average number of clients
 connecting to a bridge every day.
 There are no clients documents available for relays, just for bridges.
@@ -1914,7 +1908,6 @@ It might be removed in the future without notice./font
 /h3
 
 p
-font color=blueAdded on March 10, 2014./font
 Uptime documents contain fractional uptimes of relays and bridges.
 Uptime documents contain different time intervals and are available for
 relays and bridges.
@@ -2034,7 +2027,6 @@ of 40 upper-case hexadecimal characters.
 Object containing uptime history objects for different time periods.
 The specification of uptime history objects is similar to those in the
 stronguptime/strong field of strongrelays/strong.
-font color=redAs of April 20, 2014, this field is optional./font
 /p
 /li
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Move stylesheet to separate file.

2014-06-17 Thread karsten 
commit 4add78dc9e19cb33d3b5cd1a1e08a5993d86080f
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Tue Jun 17 09:20:37 2014 +0200

Move stylesheet to separate file.
---
 web/css/style.css |   38 ++
 web/index.html|   40 +---
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/web/css/style.css b/web/css/style.css
new file mode 100644
index 000..9649745
--- /dev/null
+++ b/web/css/style.css
@@ -0,0 +1,38 @@
+body { font-family: Open Sans,lucida grande,Segoe UI,arial,verdana,
+  lucida sans unicode,tahoma,sans-serif; background: #fafafa;
+  font-size: 13px; line-height: 22px; color: #222; }
+h1 { font-size: 20px; font-weight: normal; text-align: center; }
+h3 { color: #7D4698; position: relative }
+a { color: #7D4698; text-decoration: none; font-weight: bold; }
+ul { list-style: none; padding: 0; margin: 0; }
+p { margin: 0; padding: 0; }
+a[name] { padding: 0; margin: 0; }
+.box { max-width: 850px; width: 100%; margin: 0 auto 30px auto;
+  padding-bottom: 30px; background: white; border: 1px solid #eee; }
+.box  * { margin-left: 30px; margin-right: 30px; }
+.box h3 a { visibility: hidden; }
+.box:hover h3 a { visibility: visible; }
+.api-request { border-bottom: 1px solid #eee; position: relative }
+.request-url, .request-type, .request-response { padding: 8px 10px;
+  vertical-align: middle }
+.request-type { color: #57145F; display: inline-block; }
+.request-url { color: #333; font-size: 18px; }
+.request-response { position: absolute; color: #666; right: 0; }
+h3 .request-response { padding: 0 !important; }
+.api-urlsli:last-child { border-bottom: 0; }
+.required-true, .required-false, .typeof { display: inline-block;
+  vertical-align: middle; padding: 5px 10px; }
+.required-true { color: #1d7508; }
+.required-false { color: #aaa; }
+.properties { margin-top: 10px; margin-bottom: 10px;
+  border: 1px solid #eee; }
+.properties li { padding: 5px 0; }
+.properties li ul { border: 1px solid #eee; margin: 10px 10px 10px 40px;
+  background: white; }
+.properties .properties { margin-left: 10px; }
+.properties li:nth-child(even) { background: #fafafa; }
+.properties p { padding: 10px 15px; }
+.properties b { padding: 5px 10px; display: inline-block;
+  vertical-align: middle; }
+.api-urls{ margin-top: 30px; margin-bottom: 30px; }
+
diff --git a/web/index.html b/web/index.html
index 9777042..3de47bc 100644
--- a/web/index.html
+++ b/web/index.html
@@ -2,45 +2,7 @@
 html
 head
 titleOnionoo mdash; a Tor network status protocol/title
-style type=text/css
-body { font-family: Open Sans,lucida grande,Segoe UI,arial,verdana,
-  lucida sans unicode,tahoma,sans-serif; background: #fafafa;
-  font-size: 13px; line-height: 22px; color: #222; }
-h1 { font-size: 20px; font-weight: normal; text-align: center; }
-h3 { color: #7D4698; position: relative }
-a { color: #7D4698; text-decoration: none; font-weight: bold; }
-ul { list-style: none; padding: 0; margin: 0; }
-p { margin: 0; padding: 0; }
-a[name] { padding: 0; margin: 0; }
-.box { max-width: 850px; width: 100%; margin: 0 auto 30px auto;
-  padding-bottom: 30px; background: white; border: 1px solid #eee; }
-.box  * { margin-left: 30px; margin-right: 30px; }
-.box h3 a { visibility: hidden; }
-.box:hover h3 a { visibility: visible; }
-.api-request { border-bottom: 1px solid #eee; position: relative }
-.request-url, .request-type, .request-response { padding: 8px 10px;
-  vertical-align: middle }
-.request-type { color: #57145F; display: inline-block; }
-.request-url { color: #333; font-size: 18px; }
-.request-response { position: absolute; color: #666; right: 0; }
-h3 .request-response { padding: 0 !important; }
-.api-urlsli:last-child { border-bottom: 0; }
-.required-true, .required-false, .typeof { display: inline-block;
-  vertical-align: middle; padding: 5px 10px; }
-.required-true { color: #1d7508; }
-.required-false { color: #aaa; }
-.properties { margin-top: 10px; margin-bottom: 10px;
-  border: 1px solid #eee; }
-.properties li { padding: 5px 0; }
-.properties li ul { border: 1px solid #eee; margin: 10px 10px 10px 40px;
-  background: white; }
-.properties .properties { margin-left: 10px; }
-.properties li:nth-child(even) { background: #fafafa; }
-.properties p { padding: 10px 15px; }
-.properties b { padding: 5px 10px; display: inline-block;
-  vertical-align: middle; }
-.api-urls{ margin-top: 30px; margin-bottom: 30px; }
-/style
+link href=css/style.css type=text/css rel=stylesheet
 meta http-equiv=content-type content=text/html; charset=ISO-8859-1
 link href=favicon.ico type=image/x-icon rel=shortcut icon
 /head



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] r26839: {website} Delete Onionoo project page and point to https://onionoo.tor (in website/trunk: getinvolved/en projects/en)

2014-06-17 Thread Karsten Loesing 
Author: kloesing
Date: 2014-06-17 07:47:13 + (Tue, 17 Jun 2014)
New Revision: 26839

Removed:
   website/trunk/projects/en/onionoo.wml
Modified:
   website/trunk/getinvolved/en/volunteer.wml
   website/trunk/projects/en/projects.wml
   website/trunk/projects/en/sidenav.wmi
Log:
Delete Onionoo project page and point to https://onionoo.torproject.org/ 
instead.

Modified: website/trunk/getinvolved/en/volunteer.wml
===
--- website/trunk/getinvolved/en/volunteer.wml  2014-06-15 20:33:55 UTC (rev 
26838)
+++ website/trunk/getinvolved/en/volunteer.wml  2014-06-17 07:47:13 UTC (rev 
26839)
@@ -749,10 +749,9 @@
 /p
 
 a id=project-onionoo/a
-h3a href=page projects/onionooOnionoo/a (a
-href=https://gitweb.torproject.org/onionoo.git;java codebase/a, a
-href=https://gitweb.torproject.org/pyonionoo.git;python
-codebase/a, a 
href=https://trac.torproject.org/projects/tor/query?status=acceptedstatus=assignedstatus=needs_reviewstatus=newstatus=reopenedcomponent=Onionooorder=priority;bug
 tracker/a)/h3
+h3a href=https://onionoo.torproject.org/;Onionoo/a (a
+href=https://gitweb.torproject.org/onionoo.git;code/a,
+a 
href=https://trac.torproject.org/projects/tor/query?status=acceptedstatus=assignedstatus=needs_reviewstatus=newstatus=reopenedcomponent=Onionooorder=priority;bug
 tracker/a)/h3
 
 p
 Onionoo is a JSON based protocol to learn information about currently

Deleted: website/trunk/projects/en/onionoo.wml
===
--- website/trunk/projects/en/onionoo.wml   2014-06-15 20:33:55 UTC (rev 
26838)
+++ website/trunk/projects/en/onionoo.wml   2014-06-17 07:47:13 UTC (rev 
26839)
@@ -1,131 +0,0 @@
-## translation metadata
-# Revision: $Revision: 25342 $
-
-#include head.wmi TITLE=Tor Project: Onionoo CHARSET=UTF-8
-div id=content class=clearfix
-   div id=breadcrumbs
-a href=page indexHome raquo; /a
-a href=page projects/projectsProjects raquo; /a
-a href=page projects/onionooOnionoo/a
-  /div
-   div id=maincol 
-
-h1Onionoo/h1
-
-pOnionoo is a web-based protocol to learn about currently running
-Tor relays and bridges.  Onionoo itself was not designed as a service
-for human beingsmdash;at least not directly.  Onionoo provides the
-data for other applications and websites which in turn present Tor
-network status information to humans.  The following Onionoo clients
-are currently available:/p
-ul
-lia href=https://atlas.torproject.org/;Atlas/a is a web
-application to discover Tor relays. It provides useful
-information on how relays are configured along with graphics about
-their past./li
-lia href=https://compass.torproject.org/;Compass/a
-is a Python script and website that extracts consensus weight
-information of currently running relays and aggregates weights of
-relays running in the same country or same autonomous system./li
-lia href=http://tor2web.org/;Tor2web/a is a web proxy to Tor
-Hidden Services. It uses Onionoo to get the list of currently running
-Tor Exits to detect if the client is a Tor user and if so redirect
-them to the .onion address./li
-lia href=https://globe.torproject.org/;Globe/a is a web
-application
-that allows you to search for Tor relays and bridges. It gives you a
-detailed overview of properties and configurations of a relay or
-bridge./li
-liThe a href=https://nos-oignons.net/Services/index.en.html;Nos
-oignons/a website uses Onionoo to visualize bandwidth histories of
-their relays./li
-liThe a href=https://metrics.torproject.org/bubbles.html;metrics
-website/a visualizes diversity of the Tor network using bubble
-graphs./li
-/ul
-
-The following Onionoo clients are currently unmaintained, but are
-still a good idea:
-ul
-lia href=https://code.google.com/p/moniono/;mOnionO/a is an
-Android app that lets you add your relays or bridges to your favorites
-list and keeps you always informed whether they are running or
-not./li
-/ul
-
-h2Developing Onionoo applications/h2
-
-pThe project pages of the Onionoo clients listed above have further
-information for contacting the authors and contributing ideas or code.
-The authors will be happy to hear your thoughts!/p
-
-pYou don't find your favorite Onionoo client above?  Want to
-implement your own and tell us to add it to the list?  The Onionoo
-clients above are backed by a web-based
-a href=http://onionoo.torproject.org/;protocol/a, which
-facilitates developing new applications displaying Tor status
-information.  Here are a few ideas for new Onionoo clients:/p
-ul
-liTor controller extension: Extend
-a href=page projects/vidaliaVidalia/a and/or
-a href=page projects/armarm/a to look up details for the bridge
-that the user

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-17 Thread translation 
commit c750e319a4edee362935bb24840ab12414cb893e
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 08:45:04 2014 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 3576b78..3e53cdf 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-14 01:00+\n
-Last-Translator: Anders Jensen-Urstad and...@unix.se\n
+PO-Revision-Date: 2014-06-17 08:44+\n
+Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -250,7 +250,7 @@ msgstr Begär IPv6-bryggor
 #. TRANSLATORS: Please DO NOT translate the word the word TYPE.
 #: lib/bridgedb/strings.py:148
 msgid Request a Pluggable Transport by TYPE.
-msgstr 
+msgstr Leta efter en Pluggable Transport av en viss TYPE
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: Please DO NOT translate GnuPG.
@@ -321,7 +321,7 @@ msgstr Steg %s3%s
 #: lib/bridgedb/templates/index.html:38
 #, python-format
 msgid Now %s add the bridges to Tor Browser %s
-msgstr 
+msgstr Nu kan du %s lägga till bridges i Tor Browser %s
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -330,7 +330,7 @@ msgstr 
 #: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid %sJ%sust give me bridges!
-msgstr 
+msgstr %sG%se mig bridges!
 
 #: lib/bridgedb/templates/options.html:52
 msgid Advanced Options
@@ -358,4 +358,4 @@ msgstr %sJ%sa!
 #: lib/bridgedb/templates/options.html:154
 #, python-format
 msgid %sG%set Bridges
-msgstr 
+msgstr %sH%sämta Bridges

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-17 Thread translation 
commit 8f9bb4c705df16ec15e5b35273e8bf9d9dc8d1fd
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 09:15:02 2014 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 3e53cdf..55ec184 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-17 08:44+\n
+PO-Revision-Date: 2014-06-17 09:02+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -170,11 +170,11 @@ msgstr Försök att berätta så mycket om problemet som 
du kan, bland annat vi
 
 #: lib/bridgedb/strings.py:103
 msgid Here are your bridge lines:
-msgstr 
+msgstr Här är dina rader med bryggor:
 
 #: lib/bridgedb/strings.py:104
 msgid Get Bridges!
-msgstr Skaffa Bridges!
+msgstr Skaffa Bryggor!
 
 #: lib/bridgedb/strings.py:108
 msgid Please select options for bridge type:
@@ -241,7 +241,7 @@ msgstr Visa detta meddelande.
 #. plain-ol'-vanilla bridges.
 #: lib/bridgedb/strings.py:145
 msgid Request vanilla bridges.
-msgstr 
+msgstr Leta efter vanliga bryggor.
 
 #: lib/bridgedb/strings.py:146
 msgid Request IPv6 bridges.
@@ -321,7 +321,7 @@ msgstr Steg %s3%s
 #: lib/bridgedb/templates/index.html:38
 #, python-format
 msgid Now %s add the bridges to Tor Browser %s
-msgstr Nu kan du %s lägga till bridges i Tor Browser %s
+msgstr Nu kan du %s lägga till bryggor i Tor Browser %s
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -330,7 +330,7 @@ msgstr Nu kan du %s lägga till bridges i Tor Browser %s
 #: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid %sJ%sust give me bridges!
-msgstr %sG%se mig bridges!
+msgstr %sG%se mig bryggor!
 
 #: lib/bridgedb/templates/options.html:52
 msgid Advanced Options

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-17 Thread translation 
commit 90ca2ff84c0b4f7ed2496c063eb272bab70191f5
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 09:45:03 2014 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 55ec184..300a2cb 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-17 09:02+\n
+PO-Revision-Date: 2014-06-17 09:41+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -280,7 +280,7 @@ msgstr Kontakt
 #. or for French: Sacrebleu!. :)
 #: lib/bridgedb/templates/bridges.html:66
 msgid Uh oh, spaghettios!
-msgstr 
+msgstr Bomber och granater, nåt gick snett!
 
 #: lib/bridgedb/templates/bridges.html:72
 msgid There currently aren't any bridges available...

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2014-06-17 Thread translation 
commit 25b1315c1b19c93736fbc109c156390f02232b8c
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 09:45:05 2014 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po |  363 +---
 1 file changed, 311 insertions(+), 52 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 8d4bb80..300a2cb 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,20 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Translators:
+# Anders Jensen-Urstad and...@unix.se, 2014
+# GabSeb, 2014
 # Petomatick petomat...@hotmail.com, 2011
+# phst transi...@sturman.se, 2014
 # WinterFairy winterfa...@riseup.net, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-03-27 21:41+\n
-PO-Revision-Date: 2013-06-25 14:00+\n
-Last-Translator: WinterFairy winterfa...@riseup.net\n
+Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
+POT-Creation-Date: 2014-06-06 21:46+\n
+PO-Revision-Date: 2014-06-17 09:41+\n
+Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -21,82 +23,339 @@ msgstr 
 Language: sv\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. BridgeDB
+#. pluggable transport
+#. pluggable transports
+#. obfs2
+#. obfs3
+#. scramblesuit
+#. fteproxy
+#. Tor
+#. Tor Browser
+#: lib/bridgedb/HTTPServer.py:121
+msgid Sorry! Something went wrong with your request.
+msgstr Något gick tyvärr fel med din förfrågan.
+
+#: lib/bridgedb/strings.py:18
+msgid [This is an automated message; please do not reply.]
+msgstr [Detta är ett automatiskt meddelande; Var god svara ej]
+
+#: lib/bridgedb/strings.py:20
+msgid Here are your bridges:
+msgstr Här är dina bryggor:
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid 
+You have exceeded the rate limit. Please slow down! The minimum time 
between\n
+emails is %s hours. All further emails during this time period will be 
ignored.
+msgstr Du har överskridit din nivå. Ta det lugnt! Minsta tillåtna tiden 
mellan epost är %s timmar. Epost utöver detta kommer att ignoreras.
+
+#: lib/bridgedb/strings.py:25
+msgid 
+COMMANDs: (combine COMMANDs to specify multiple options simultaneously)
+msgstr KOMMANDOn: (kombinera KOMMANDOn för att ange flera val på en gång)
+
+#. TRANSLATORS: Please DO NOT translate the word BridgeDB.
+#: lib/bridgedb/strings.py:28
+msgid Welcome to BridgeDB!
+msgstr Välkommen till BridgeDB!
+
+#. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
+#: lib/bridgedb/strings.py:30
+msgid Currently supported transport TYPEs:
+msgstr För närvarande stöds följande transport TYPEs:
+
+#: lib/bridgedb/strings.py:31
+#, python-format
+msgid Hey, %s!
+msgstr Hej, %s!
+
+#: lib/bridgedb/strings.py:32
+msgid Hello, friend!
+msgstr Hej, kompis!
+
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+msgid Public Keys
+msgstr Publika nycklar
+
+#. TRANSLATORS: This string will end up saying something like:
+#. This email was generated with rainbows, unicorns, and sparkles
+#. for al...@example.com on Friday, 09 May, 2014 at 18:59:39.
+#: lib/bridgedb/strings.py:37
+#, python-format
+msgid 
+This email was generated with rainbows, unicorns, and sparkles\n
+for %s on %s at %s.
+msgstr Det här mailet skapades med hjälp av regnbågar, enhörningar och 
\nett regn av gnistor för %s den %s kl %s.
+
+#. TRANSLATORS: Please DO NOT translate BridgeDB.
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#. TRANSLATORS: Please DO NOT translate Tor.
+#. TRANSLATORS: Please DO NOT translate Tor Network.
+#: lib/bridgedb/strings.py:47
+#, python-format
+msgid 
+BridgeDB can provide bridges with several %stypes of Pluggable 
Transports%s,\n
+which can help obfuscate your connections to the Tor Network, making it 
more\n
+difficult for anyone watching your internet traffic to determine that you 
are\n
+using Tor.\n
+\n
+msgstr BridgeDB kan tillhandahålla bryggor med flera %styper av Pluggable 
Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det 
svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du 
använder Tor.\n\n
+
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#: lib/bridgedb/strings.py:54
+msgid 
+Some

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-06-17 Thread translation 
commit bb250e478fab4c9c8e289602268e6ffc303eb6d7
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 09:45:52 2014 +

Update translations for tor-and-https
---
 sv.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv.po b/sv.po
index d6004fb..52c550b 100644
--- a/sv.po
+++ b/sv.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-05-24 18:11+\n
-PO-Revision-Date: 2014-06-09 13:20+\n
+PO-Revision-Date: 2014-06-17 09:45+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -90,7 +90,7 @@ msgstr Jurist
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Sysadmin
-msgstr System admin
+msgstr Sysadmin
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2014-06-17 Thread translation 
commit b83c5cd735b234f9ad717a7a48e731c0b66abc43
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 09:45:55 2014 +

Update translations for tor-and-https_completed
---
 sv.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv.po b/sv.po
index d6004fb..52c550b 100644
--- a/sv.po
+++ b/sv.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-05-24 18:11+\n
-PO-Revision-Date: 2014-06-09 13:20+\n
+PO-Revision-Date: 2014-06-17 09:45+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -90,7 +90,7 @@ msgstr Jurist
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Sysadmin
-msgstr System admin
+msgstr Sysadmin
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Add OnionPy to list of related projects.

2014-06-17 Thread karsten 
commit 1b4bd77704433cac644966331a55a408487f973c
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Tue Jun 17 11:47:18 2014 +0200

Add OnionPy to list of related projects.
---
 web/index.html |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index b6b0519..fce4894 100644
--- a/web/index.html
+++ b/web/index.html
@@ -45,7 +45,7 @@ website/a visualizes diversity of the Tor network using 
bubble
 graphs./li
 /ul
 
-pThe following Onionoo clients are currently unmaintained, but are
+pThe following Onionoo client is currently unmaintained, but is
 still a good idea:/p
 ul
 lia href=https://code.google.com/p/moniono/;mOnionO/a is an
@@ -54,6 +54,13 @@ list and keeps you always informed whether they are running 
or
 not./li
 /ul
 
+pThe following library facilitates development of Onionoo clients:/p
+ul
+lia href=https://github.com/duk3luk3/onion-py;OnionPy/a is a
+comprehensive pure-Python (2.7+) Onionoo wrapper with caching
+support./li
+/ul
+
 h2Developing Onionoo applications/h2
 
 pThe project pages of the Onionoo clients listed above have further

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2014-06-17 Thread translation 
commit 18ecee40ce14e51719ed96bd1e5b49446aa0ada2
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 10:15:05 2014 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 300a2cb..62c7622 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-17 09:41+\n
+PO-Revision-Date: 2014-06-17 09:50+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-17 Thread translation 
commit 56957c5f99cf36b22aac41316d527542eea2a6f4
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 10:15:02 2014 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 300a2cb..62c7622 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-17 09:41+\n
+PO-Revision-Date: 2014-06-17 09:50+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2014-06-17 Thread translation 
commit 01f95bae45cc42ceda94494d9e24986ff2b07b8b
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 10:15:54 2014 +

Update translations for tor-and-https_completed
---
 sv.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sv.po b/sv.po
index 52c550b..79d3087 100644
--- a/sv.po
+++ b/sv.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-05-24 18:11+\n
-PO-Revision-Date: 2014-06-17 09:45+\n
+PO-Revision-Date: 2014-06-17 09:50+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -116,7 +116,7 @@ msgstr Tor relay
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Key
-msgstr Nyckel
+msgstr Förklaring
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:346
@@ -128,10 +128,10 @@ msgstr Internetanslutning
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Eavesdropping
-msgstr Avlyssna
+msgstr Avlyssning
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Data sharing
-msgstr Data delning
+msgstr Data delas

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-06-17 Thread translation 
commit 7ce648c7e2493d965401763d405db1b5d990b17b
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 10:15:51 2014 +

Update translations for tor-and-https
---
 sv.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sv.po b/sv.po
index 52c550b..79d3087 100644
--- a/sv.po
+++ b/sv.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-05-24 18:11+\n
-PO-Revision-Date: 2014-06-17 09:45+\n
+PO-Revision-Date: 2014-06-17 09:50+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -116,7 +116,7 @@ msgstr Tor relay
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Key
-msgstr Nyckel
+msgstr Förklaring
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:346
@@ -128,10 +128,10 @@ msgstr Internetanslutning
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Eavesdropping
-msgstr Avlyssna
+msgstr Avlyssning
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:346
 #, no-wrap
 msgid Data sharing
-msgstr Data delning
+msgstr Data delas

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-17 Thread translation 
commit e8ccf60b1c25c95d63280048f275cca43739a151
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jun 17 14:15:03 2014 +

Update translations for bridgedb
---
 ru/LC_MESSAGES/bridgedb.po |   27 ++-
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index 75ccb0b..822ce69 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Denis stereode...@gmail.com, 2014
 # Eugene, 2013
 # liquixis liqui...@gmail.com, 2012
 # Sergey Briskin sergey.bris...@gmail.com, 2014
@@ -12,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-13 13:50+\n
-Last-Translator: Valid Olov\n
+PO-Revision-Date: 2014-06-17 14:00+\n
+Last-Translator: Denis stereode...@gmail.com\n
 Language-Team: Russian 
(http://www.transifex.com/projects/p/torproject/language/ru/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -70,11 +71,11 @@ msgstr 
 #: lib/bridgedb/strings.py:31
 #, python-format
 msgid Hey, %s!
-msgstr 
+msgstr Эй, %s!
 
 #: lib/bridgedb/strings.py:32
 msgid Hello, friend!
-msgstr 
+msgstr Привет, друг!
 
 #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
 msgid Public Keys
@@ -155,7 +156,7 @@ msgstr Мои мосты не работают! 
Помогите!
 #: lib/bridgedb/strings.py:92
 #, python-format
 msgid If your Tor doesn't work, you should email %s.
-msgstr 
+msgstr Если ваш Tor не работает, напишите нам %s.
 
 #. TRANSLATORS: Please DO NOT translate Pluggable Transports.
 #. TRANSLATORS: Please DO NOT translate Tor Browser.
@@ -186,11 +187,11 @@ msgstr 
 #: lib/bridgedb/strings.py:110
 #, python-format
 msgid Do you need a %s?
-msgstr 
+msgstr Вам нужен %s?
 
 #: lib/bridgedb/strings.py:114
 msgid Your browser is not displaying images properly.
-msgstr 
+msgstr Ваш браузер не показывает изображения 
должным образом.
 
 #: lib/bridgedb/strings.py:115
 msgid Enter the characters from the image above...
@@ -263,15 +264,15 @@ msgstr Сообщить об ошибке
 
 #: lib/bridgedb/templates/base.html:93
 msgid Source Code
-msgstr 
+msgstr Исходный код
 
 #: lib/bridgedb/templates/base.html:96
 msgid Changelog
-msgstr 
+msgstr Лог изменений
 
 #: lib/bridgedb/templates/base.html:98
 msgid Contact
-msgstr 
+msgstr Контакт
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. There was a problem! in your language. For example,
@@ -295,7 +296,7 @@ msgstr 
 #: lib/bridgedb/templates/index.html:11
 #, python-format
 msgid Step %s1%s
-msgstr 
+msgstr Шаг %s1%s
 
 #: lib/bridgedb/templates/index.html:13
 #, python-format
@@ -315,7 +316,7 @@ msgstr Получите %s мосты %s
 #: lib/bridgedb/templates/index.html:36
 #, python-format
 msgid Step %s3%s
-msgstr 
+msgstr Шаг %s3%s
 
 #: lib/bridgedb/templates/index.html:38
 #, python-format
@@ -333,7 +334,7 @@ msgstr 
 
 #: lib/bridgedb/templates/options.html:52
 msgid Advanced Options
-msgstr 
+msgstr Расширенные настройки
 
 #: lib/bridgedb/templates/options.html:88
 msgid No

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] fixes #12411 and #12412 enables DNS and transport by default

2014-06-17 Thread n8fr8 
commit b6715b4d3c3e84caab6108e3702010066f2b36db
Author: Nathan Freitas nat...@freitas.net
Date:   Tue Jun 17 15:42:54 2014 -0400

fixes #12411 and #12412 enables DNS and transport by default
with new Orbot settings to enable user to easily change/disable
---
 res/values/strings.xml |   14 ++-
 res/xml/preferences.xml|   14 +++
 src/org/torproject/android/service/TorService.java |   42 +++-
 .../android/service/TorServiceConstants.java   |4 +-
 .../torproject/android/service/TorTransProxy.java  |   32 ++-
 5 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4456aff..d380579 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -258,8 +258,18 @@
 string name=updating_settings_in_tor_serviceupdating settings in Tor 
service/string
   
 string name=pref_socks_titleTor SOCKS/string
-string name=pref_socks_summaryIP and Port that Tor offers its SOCKS 
proxy on (default: 9050)/string
-string name=pref_socks_dialogSOCKS Config (ip:port)/string
+string name=pref_socks_summaryPort that Tor offers its SOCKS proxy on 
(default: 9050 or 0 to disable)/string
+string name=pref_socks_dialogSOCKS Port Config/string
+
+string name=pref_transport_titleTor TransProxy Port/string
+string name=pref_transport_summaryPort that Tor offers its Transparent 
Proxy on (default: 9040 or 0 to disable)/string
+string name=pref_transport_dialogTransProxy Port Config/string
+
+
+string name=pref_dnsport_titleTor DNS Port/string
+string name=pref_dnsport_summaryPort that Tor offers its DNS on 
(default: 5400 or 0 to disable)/string
+string name=pref_dnsport_dialogDNS Port Config/string
+
 
 string name=pref_torrc_titleTorrc Custom Config/string
 string name=pref_torrc_summaryEXPERTS ONLY: enter direct torrc config 
lines/string
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 0277343..22502b6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -204,6 +204,20 @@ android:dialogTitle=@string/pref_socks_dialog
 android:defaultValue=9050
 /
 
+  EditTextPreference android:key=pref_transport
+android:title=@string/pref_transport_title
+android:summary=@string/pref_transport_summary
+android:dialogTitle=@string/pref_transport_dialog
+android:defaultValue=9040
+/
+  
+EditTextPreference android:key=pref_dnsport
+android:title=@string/pref_dnsport_title
+android:summary=@string/pref_dnsport_summary
+android:dialogTitle=@string/pref_dnsport_dialog
+android:defaultValue=5400
+/
+
   EditTextPreference android:key=pref_custom_torrc
 android:title=@string/pref_torrc_title
 android:summary=@string/pref_torrc_summary
diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index 5f9e178..5acb900 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -659,19 +659,24 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
{
mTransProxy = new TorTransProxy(this, fileXtables);

-   
}

 
-   logMessage (Transparent Proxying: updating Tor settings...);
-   
-   mBinder.updateConfiguration(TransPort,9040,false);
-   mBinder.updateConfiguration(DNSPort,5400,false);
-   
mBinder.updateConfiguration(VirtualAddrNetwork,10.192.0.0/10,false);
-   mBinder.updateConfiguration(AutomapHostsOnResolve,1,false);
-   mBinder.saveConfiguration();
-   
 
+   SharedPreferences prefs = 
TorServiceUtils.getSharedPrefs(getApplicationContext());
+   String transProxy = prefs.getString(pref_transport, 
TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+);
+   String dnsPort = prefs.getString(pref_dnsport, 
TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+);
+   
+   if (transProxy.indexOf(':')!=-1) //we just want the port for 
this
+   transProxy = transProxy.split(:)[1];
+   
+   if (dnsPort.indexOf(':')!=-1) //we just want the port for this
+   dnsPort = dnsPort.split(:)[1];
+   
+   mTransProxy.setTransProxyPort(Integer.parseInt(transProxy));
+   mTransProxy.setDNSPort(Integer.parseInt(dnsPort));
+
+ 
//TODO: Find a nice place for the next (commented) line
//TorTransProxy.setDNSProxying(); 

@@ -1781,6 +1786,12 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
enableSocks (socksConfig,false);

+   String transPort =

[tor-commits] [orbot/master] fulfilles the wishes of #12413 by support --default-torrc and -f

2014-06-17 Thread n8fr8 
commit 2eb79a51856b05fc2636d81ed15bd75755646972
Author: Nathan Freitas nat...@freitas.net
Date:   Tue Jun 17 16:32:49 2014 -0400

fulfilles the wishes of #12413 by support --default-torrc and -f
---
 .../android/service/TorResourceInstaller.java  |   29 +---
 src/org/torproject/android/service/TorService.java |   73 
 2 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/src/org/torproject/android/service/TorResourceInstaller.java 
b/src/org/torproject/android/service/TorResourceInstaller.java
index 9478384..3e91ea4 100644
--- a/src/org/torproject/android/service/TorResourceInstaller.java
+++ b/src/org/torproject/android/service/TorResourceInstaller.java
@@ -116,35 +116,12 @@ public class TorResourceInstaller implements 
TorServiceConstants {
return true;
}

-   public boolean updateTorConfig (File fileTorRc, String extraLines) 
throws IOException, FileNotFoundException, TimeoutException
+   public boolean updateTorConfigCustom (File fileTorRcCustom, String 
extraLines) throws IOException, FileNotFoundException, TimeoutException
{

-   InputStream is;
-
-Shell shell = Shell.startShell(new 
ArrayListString(),installFolder.getAbsolutePath());
-
-   is = context.getResources().openRawResource(R.raw.torrc);   

-   shell.add(new SimpleCommand(COMMAND_RM_FORCE + 
fileTorRc.getAbsolutePath())).waitForFinish();
-   streamToFile(is,fileTorRc, false, false);
 
-   if (extraLines != null  extraLines.length()  0)
-   {
-   StringBufferInputStream sbis = new 
StringBufferInputStream('\n' + extraLines + '\n');
-   streamToFile(sbis,fileTorRc,true,false);
-   }
-   
-   is = context.getResources().openRawResource(R.raw.torrcdiag);
-   fileTorRc = new File(installFolder, TORRCDIAG_ASSET_KEY);
-   shell.add(new SimpleCommand(COMMAND_RM_FORCE + 
fileTorRc.getAbsolutePath())).waitForFinish();
-   streamToFile(is,fileTorRc, false, false);
-
-   if (extraLines != null  extraLines.length()  0)
-   {
-   StringBufferInputStream sbis = new 
StringBufferInputStream('\n' + extraLines + '\n');
-   streamToFile(sbis,fileTorRc,true,false);
-   }
-   
-   shell.close();
+   StringBufferInputStream sbis = new 
StringBufferInputStream(extraLines + '\n');
+   streamToFile(sbis,fileTorRcCustom,false,false);

return true;
}
diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index 5acb900..cca714c 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -23,8 +23,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.TimeoutException;
 
 import net.freehaven.tor.control.ConfigEntry;
@@ -54,6 +52,7 @@ import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.AsyncTask;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
@@ -194,7 +193,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
public int getTorStatus ()
 {
-   
+   
return currentStatus;

 }
@@ -236,10 +235,14 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
if (notifyId == ERROR_NOTIFY_ID)
{
mNotifyBuilder.setTicker(notifyMsg);
-   mNotifyBuilder.setOngoing(false);
mNotifyBuilder.setLights(Color.RED, 1000, 1000);

mNotifyBuilder.setSmallIcon(R.drawable.ic_stat_notifyerr);
}
+   else
+   {
+   mNotifyBuilder.setTicker();
+   //mNotifyBuilder.setLights(Color.GREEN, 5000, 5000);
+   }

if (isOngoing)
{
@@ -559,9 +562,10 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
extraLines.append('\n');
extraLines.append(prefs.getString(pref_custom_torrc, ));
 
-   logNotice(updating torrc configuration...);
+   logNotice(updating torrc custom configuration...);
 
-   boolean success = installer.updateTorConfig(fileTorRc, 
extraLines.toString());
+   File fileTorRcCustom = new File(fileTorRc.getAbsolutePath() + 
.custom);
+