April 2013 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Apr '13

17 Apr '13

commit bf87dc9457913c442b56fae1d7db2a4273bd09c6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 14:45:06 2013 +0000 Update translations for gettor --- ar/gettor.po | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index b66a3cc..5dc0449 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -3,20 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ahmad LuvSy <donotplay(a)hotmail.ca>, 2012. -# Fadi Mansour <fadi.redeemer.mansour(a)gmail.com>, 2011. -# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. -# <modafar22(a)hotmail.com>, 2011. -# mohammad Alhargan <malham1(a)gmail.com>, 2011. -# Mohammed Al-Doub <voulnet(a)gmail.com>, 2012. -# Mohammed ALDOUB <voulnet(a)gmail.com>, 2013. -# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013. +# Ahmad LuvSy <Luvsystone(a)hotmail.com>, 2012 +# Ahmad LuvSy <Luvsystone(a)hotmail.com>, 2012 +# Fadi Mansour <fadi.redeemer.mansour(a)gmail.com>, 2011 +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 +# modafar <modafar22(a)hotmail.com>, 2011 +# modafar <modafar22(a)hotmail.com>, 2011 +# محمد الحرقان <malham1(a)gmail.com>, 2011 +# Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 +# Mohammed ALDOUB <voulnet(a)gmail.com>, 2012-2013 +# Sherief <sheriefalaa.w(a)gmail.com>, 2013 +# Sherief <sheriefalaa.w(a)gmail.com>, 2013 +# محمد الحرقان <malham1(a)gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-16 21:38+0000\n" +"PO-Revision-Date: 2013-04-17 14:31+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -27,7 +31,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "مرحباً، أنا روبوت \"إحصل على تور\"." +msgstr "مرحبا، هذا برنامج \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request."

1 0

[tlsdate/master] Add note on likely emerge command for Gentoo in INSTALL
by ioerror＠torproject.org 17 Apr '13

17 Apr '13

commit c6ca4c9b8d91950c8a3f0fabca84da48d33a580c Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 02:44:10 2013 -0700 Add note on likely emerge command for Gentoo in INSTALL --- INSTALL | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 423ed93..6f4b5bb 100644 --- a/INSTALL +++ b/INSTALL @@ -13,6 +13,7 @@ tlsdate should build and work on the following Operating Systems: Arch Linux (Don't forget to symlink to /dev/rtc to /dev/rtc0) NetBSD 6.0.1 OpenBSD 5.2 + Gentoo 20130413 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for @@ -39,10 +40,14 @@ Cleaning is the usual: make clean -On Debian Gnu/Linux sid/unstable +On Debian Gnu/Linux sid/unstable: apt-get install tlsdate +On Gentoo: + + emerge net-misc/tlsdate + On FreeBSD one may also use the ports system: cd /usr/ports/sysutils/tlsdate

1 0

[tlsdate/debian-master] Add Continuous Integration note; update supported platform details
by ioerror＠torproject.org 17 Apr '13

17 Apr '13

commit 5e5cedbba4b1779a71a35222dd7a1a6fc492bfda Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 16 19:19:37 2013 -0700 Add Continuous Integration note; update supported platform details --- HACKING | 5 +++++ INSTALL | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/HACKING b/HACKING index 09754a7..cb4564f 100644 --- a/HACKING +++ b/HACKING @@ -11,6 +11,11 @@ Please file bugs on the tlsdate issue tracker: Please use the github pull request feature when possible. +Continuous integration is available for a number of platforms: + + https://jenkins.torproject.org/job/tlsdate-ci-linux/ + https://travis-ci.org/ioerror/tlsdate + White Space: Spaces only, no tabs; all tabs must die diff --git a/INSTALL b/INSTALL index 78504e2..423ed93 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ tlsdate should build and work on the following Operating Systems: - Debian Gnu/Linux 6.0.7 (apt-get install tlsdate for Debian unstable) - Ubuntu 11.04, 12.04, 12.10 + Debian Gnu/Linux squeeze, wheezy, sid + Ubuntu lucid, natty, oneiric, precise, quantal CentOS 6.2, 6.3, 6.4 Fedora 17, 18 RedHat Enterprise Server 6.4 @@ -28,7 +28,7 @@ Currently porting is in progress or partially documented for: Plan9 (with APE) -Building and install of tlsdate on GNU/Linux and FreeBSD should be as easy as: +Building and install of tlsdate on GNU/Linux and FreeBSD: ./autogen.sh ./configure @@ -39,6 +39,10 @@ Cleaning is the usual: make clean +On Debian Gnu/Linux sid/unstable + + apt-get install tlsdate + On FreeBSD one may also use the ports system: cd /usr/ports/sysutils/tlsdate

1 0

[tlsdate/debian-master] Add Continuous Integration note; update supported platform details
by ioerror＠torproject.org 17 Apr '13

17 Apr '13

commit 4bc568ba1ef0ec80f331306a56685dfc3254aa10 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 16 19:19:37 2013 -0700 Add Continuous Integration note; update supported platform details --- HACKING | 5 +++++ INSTALL | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/HACKING b/HACKING index 09754a7..cb4564f 100644 --- a/HACKING +++ b/HACKING @@ -11,6 +11,11 @@ Please file bugs on the tlsdate issue tracker: Please use the github pull request feature when possible. +Continuous integration is available for a number of platforms: + + https://jenkins.torproject.org/job/tlsdate-ci-linux/ + https://travis-ci.org/ioerror/tlsdate + White Space: Spaces only, no tabs; all tabs must die diff --git a/INSTALL b/INSTALL index 78504e2..423ed93 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ tlsdate should build and work on the following Operating Systems: - Debian Gnu/Linux 6.0.7 (apt-get install tlsdate for Debian unstable) - Ubuntu 11.04, 12.04, 12.10 + Debian Gnu/Linux squeeze, wheezy, sid + Ubuntu lucid, natty, oneiric, precise, quantal CentOS 6.2, 6.3, 6.4 Fedora 17, 18 RedHat Enterprise Server 6.4 @@ -28,7 +28,7 @@ Currently porting is in progress or partially documented for: Plan9 (with APE) -Building and install of tlsdate on GNU/Linux and FreeBSD should be as easy as: +Building and install of tlsdate on GNU/Linux and FreeBSD: ./autogen.sh ./configure @@ -39,6 +39,10 @@ Cleaning is the usual: make clean +On Debian Gnu/Linux sid/unstable + + apt-get install tlsdate + On FreeBSD one may also use the ports system: cd /usr/ports/sysutils/tlsdate

1 0

[tlsdate/debian-master] Merge branch 'master' into debian-master
by ioerror＠torproject.org 17 Apr '13

17 Apr '13

commit efa8e9c4ef056e1d881736a1d53c284273451881 Merge: 5e5cedb 4bc568b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 16 19:19:53 2013 -0700 Merge branch 'master' into debian-master

1 0

[tlsdate/master] Add Continuous Integration note; update supported platform details
by ioerror＠torproject.org 17 Apr '13

17 Apr '13

commit 4bc568ba1ef0ec80f331306a56685dfc3254aa10 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 16 19:19:37 2013 -0700 Add Continuous Integration note; update supported platform details --- HACKING | 5 +++++ INSTALL | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/HACKING b/HACKING index 09754a7..cb4564f 100644 --- a/HACKING +++ b/HACKING @@ -11,6 +11,11 @@ Please file bugs on the tlsdate issue tracker: Please use the github pull request feature when possible. +Continuous integration is available for a number of platforms: + + https://jenkins.torproject.org/job/tlsdate-ci-linux/ + https://travis-ci.org/ioerror/tlsdate + White Space: Spaces only, no tabs; all tabs must die diff --git a/INSTALL b/INSTALL index 78504e2..423ed93 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ tlsdate should build and work on the following Operating Systems: - Debian Gnu/Linux 6.0.7 (apt-get install tlsdate for Debian unstable) - Ubuntu 11.04, 12.04, 12.10 + Debian Gnu/Linux squeeze, wheezy, sid + Ubuntu lucid, natty, oneiric, precise, quantal CentOS 6.2, 6.3, 6.4 Fedora 17, 18 RedHat Enterprise Server 6.4 @@ -28,7 +28,7 @@ Currently porting is in progress or partially documented for: Plan9 (with APE) -Building and install of tlsdate on GNU/Linux and FreeBSD should be as easy as: +Building and install of tlsdate on GNU/Linux and FreeBSD: ./autogen.sh ./configure @@ -39,6 +39,10 @@ Cleaning is the usual: make clean +On Debian Gnu/Linux sid/unstable + + apt-get install tlsdate + On FreeBSD one may also use the ports system: cd /usr/ports/sysutils/tlsdate

1 0

[bridgedb/master] Add URLs to Torproject
by aagbsn＠torproject.org 17 Apr '13

17 Apr '13

commit a178fe2bedc28d03a95f0bf26478dee03cf98bd6 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Mar 26 23:28:00 2013 +0000 Add URLs to Torproject --- lib/bridgedb/templates/index.html | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index ae1f0e5..0193a14 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -5,7 +5,8 @@ <div class="span1"> <p class="lead"><span class="step-title"> ${_("Step 1")} </span></p></div> <div class="span5 step-text"> - ${_("Get %s Tor Browser Bundle %s") % ("""<a href="#">""", "</a>")}</div> + ${_("Get %s Tor Browser Bundle %s") % \ +("""<a href="https://www.torproject.org/download/download-easy.html">""", "</a>")}</div> </div> <div class="step row"> <div class="span1"> @@ -17,7 +18,8 @@ <div class="span1"> <p class="lead"><span class="step-title"> ${_("Step 3")} </span></p></div> <div class="span5 step-text"> - ${_("Now %s add the bridges to Vidalia %s") % ("""<a href="#">""", "</a>")} + ${_("Now %s add the bridges to Tor %s") % \ + ("""<a href="https://www.torproject.org/docs/bridges#UsingBridges">""", "</a>")} </div> </div> <hr>

1 0

[bridgedb/master] Fix tags in templates
by aagbsn＠torproject.org 17 Apr '13

17 Apr '13

commit c7e00ba44a45bee83e70ce81bb312dbc217f6fe2 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Mar 27 03:35:04 2013 +0000 Fix tags in templates * Remove extra </div> and <hr> --- lib/bridgedb/templates/base.html | 1 - lib/bridgedb/templates/bridges.html | 3 +-- lib/bridgedb/templates/captcha.html | 1 - lib/bridgedb/templates/index.html | 1 - 4 files changed, 1 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index adbc81c..4abf52f 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -54,7 +54,6 @@ ${self.body()} help(a)rt.torproject.org</a>""")}</p> </div> </div> -</div> <hr> <div class="footer"> diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index 71e3050..53d8d32 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -7,9 +7,8 @@ ${answer} </pre> <br /> -<p >${_("""To use the above lines, go to Vidalia's Network settings page, and click "My ISP blocks connections to the Tor network". Then add each bridge address one at a time.""")} +<p>${_("""To use the above lines, go to Vidalia's Network settings page, and click "My ISP blocks connections to the Tor network". Then add each bridge address one at a time.""")} </p> % else: <h3> ${_("No bridges currently available")} </h3> % endif -<hr> diff --git a/lib/bridgedb/templates/captcha.html b/lib/bridgedb/templates/captcha.html index 1504b54..0d9e564 100644 --- a/lib/bridgedb/templates/captcha.html +++ b/lib/bridgedb/templates/captcha.html @@ -11,4 +11,3 @@ <input class="btn btn-success" type="submit" name="submit" value="I am human"> </form> </div> -<hr> diff --git a/lib/bridgedb/templates/index.html b/lib/bridgedb/templates/index.html index 0193a14..53460d2 100644 --- a/lib/bridgedb/templates/index.html +++ b/lib/bridgedb/templates/index.html @@ -22,4 +22,3 @@ ("""<a href="https://www.torproject.org/docs/bridges#UsingBridges">""", "</a>")} </div> </div> -<hr>

1 0

[bridgedb/master] Remove Session Cookie
by aagbsn＠torproject.org 17 Apr '13

17 Apr '13

commit 4307e958bf3711e9cab542f80df55bf760288b7d Author: aagbsn <aagbsn(a)extc.org> Date: Wed Mar 27 23:38:00 2013 +0000 Remove Session Cookie --- lib/bridgedb/HTTPServer.py | 60 +++---------------------------------------- 1 files changed, 5 insertions(+), 55 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index dcd1dcd..dc61124 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -16,7 +16,7 @@ import os from twisted.internet import reactor import twisted.web.resource -from twisted.web.server import Site, Session +from twisted.web.server import Site from twisted.web import static from twisted.web.util import redirectTo @@ -33,7 +33,6 @@ from random import randint from mako.template import Template from mako.lookup import TemplateLookup from zope.interface import Interface, Attribute, implements -from twisted.python.components import registerAdapter template_root = os.path.join(os.path.dirname(__file__),'templates') lookup = TemplateLookup(directories=[template_root], @@ -49,19 +48,9 @@ except: geoip = None logging.warn("GeoIP database not found") -class ICaptchaState(Interface): - captchaSolved = Attribute("A bool that indicates whether a Captcha has been solved") - clientIP = Attribute("The IP address of the client") - -class CaptchaState(object): - implements(ICaptchaState) - def __init__(self, session): - self.captchaSolved = False - self.clientIP = "" - class CaptchaProtectedResource(twisted.web.resource.Resource): - def __init__(self, useRecaptcha=False, recaptchaPrivKey='', recaptchaPubKey='', - useForwardedHeader=False, resource=None): + def __init__(self, useRecaptcha=False, recaptchaPrivKey='', + recaptchaPubKey='', useForwardedHeader=False, resource=None): self.isLeaf = resource.isLeaf self.useForwardedHeader = useForwardedHeader self.recaptchaPrivKey = recaptchaPrivKey @@ -82,10 +71,6 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): return ip def render_GET(self, request): - if self.captchaSolved(request): - getSession(request).expire() - return self.resource.render(request) - # get a captcha c = Raptcha(self.recaptchaPubKey, self.recaptchaPrivKey) c.get() @@ -94,18 +79,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(c.image) return lookup.get_template('captcha.html').render(imgstr=imgstr, challenge_field=c.challenge) - def captchaSolved(self, request): - s = ICaptchaState(getSession(request)) - ip = self.getClientIP(request) - if s.captchaSolved and ip == s.clientIP: - return True - return False - def render_POST(self, request): - if self.captchaSolved(request): - getSession(request).expire() - return self.resource.render(request) - try: challenge = request.args['recaptcha_challenge_field'][0] response = request.args['recaptcha_response_field'][0] @@ -121,10 +95,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): if recaptcha_response.is_valid: logging.info("Valid recaptcha from %s. Parameters were %r", remote_ip, request.args) - # set a valid captcha solved for this session! - c = ICaptchaState(getSession(request)) - c.captchaSolved = True - c.clientIP = self.getClientIP(request) + return self.resource.render(request) else: logging.info("Invalid recaptcha from %s. Parameters were %r", remote_ip, request.args) @@ -155,7 +126,7 @@ class WebResource(twisted.web.resource.Resource): if not domains: domains = [] self.domains = domains - def render_GET(self, request): + def render(self, request): return self.getBridgeRequestAnswer(request) def getBridgeRequestAnswer(self, request): @@ -250,26 +221,6 @@ class WebRoot(twisted.web.resource.Resource): def render_GET(self, request): return lookup.get_template('index.html').render() -def getSession(self, sessionInterface = None): - # Session management - if not self.session: - cookiename = b"_".join([b'TWISTED_SESSION'] + self.sitepath) - sessionCookie = self.getCookie(cookiename) - if sessionCookie: - try: - self.session = self.site.getSession(sessionCookie) - except KeyError: - pass - # if it still hasn't been set, fix it up. - if not self.session: - self.session = self.site.makeSession() - #XXX: secure cookies - self.addCookie(cookiename, self.session.uid, path=b'/', secure=True, max_age=60) - self.session.touch() - if sessionInterface: - return self.session.getComponent(sessionInterface) - return self.session - def addWebServer(cfg, dist, sched): """Set up a web server. cfg -- a configuration object from Main. We use these options: @@ -297,7 +248,6 @@ def addWebServer(cfg, dist, sched): domains=cfg.EMAIL_DOMAINS) if cfg.RECAPTCHA_ENABLED: - registerAdapter(CaptchaState, Session, ICaptchaState) protected = CaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY,

1 0

[bridgedb/master] 5482 - Parse descriptors to glean bridge stability information.
by aagbsn＠torproject.org 17 Apr '13

17 Apr '13

commit 73440e363ffe018ff02dced7478a01a995f591ce Author: aagbsn <aagbsn(a)extc.org> Date: Tue Oct 23 07:45:50 2012 -0700 5482 - Parse descriptors to glean bridge stability information. --- lib/bridgedb/Main.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 31c9917..56a52dd 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -174,9 +174,10 @@ def load(cfg, splitter, clear=False): #transports[ID] = transports f.close() bridges = {} + db = bridgedb.Storage.getDB() for fname in cfg.BRIDGE_FILES: f = open(fname, 'r') - for bridge in Bridges.parseDescFile(f, cfg.BRIDGE_PURPOSE): + for bridge, timestamp in Bridges.parseDescFile(f, cfg.BRIDGE_PURPOSE): bridges[bridge.getID()] = bridge s = status.get(bridge.getID()) if s is not None: @@ -184,6 +185,11 @@ def load(cfg, splitter, clear=False): bridge.setStatus(running=running, stable=stable) bridge.or_addresses = addresses.get(bridge.getID()) splitter.insert(bridge) + # add or update BridgeHistory entries into the database + # XXX: what do we do with all these or_addresses? + # The bridge stability metrics are only concerned with a single ip:port + # So for now, we will only consider the bridges primary IP:port + bridgedb.Stability.addOrUpdateBridgeHistory(bridge, timestamp) f.close() # read pluggable transports from extra-info document # XXX: should read from networkstatus after bridge-authority

1 0