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

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 15 Jun '13

15 Jun '13

commit a7c9a581c67e7606ce519aee45d0eff2205906c5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 15 13:45:35 2013 +0000 Update translations for vidalia_alpha --- fr/vidalia_fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index 1dc956a..9a40914 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -12,7 +12,7 @@ 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: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-15 13:40+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 15 Jun '13

15 Jun '13

commit ad6a8da6331f9e377122ec5694247fa0782e630a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 15 13:45:32 2013 +0000 Update translations for vidalia_completed --- fr/vidalia_fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index c676b9c..a910f48 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -13,7 +13,7 @@ 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:52+0000\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-15 13:40+0000\n" "Last-Translator: Onizuka\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 15 Jun '13

15 Jun '13

commit 8efba4922ec007e9b8073f0ed229ea7165035e2a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 15 13:45:23 2013 +0000 Update translations for vidalia --- fr/vidalia_fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index c676b9c..a910f48 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -13,7 +13,7 @@ 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:52+0000\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-15 13:40+0000\n" "Last-Translator: Onizuka\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[torbrowser/maint-2.4] Fix a versions parse error spotted by Micah.
by mikeperry＠torproject.org 15 Jun '13

15 Jun '13

commit 633dd7fb876993ab0eb5be76b5c2651647283f8e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 14 22:10:21 2013 -0700 Fix a versions parse error spotted by Micah. Thanks, Micah! --- build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index a535941..73f675c 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -5,8 +5,8 @@ "2.3.25-9-Linux", "2.4.12-alpha-2-MacOS", "2.4.12-alpha-2-Windows", -"2.4.12-alpha-2-Linux" -"3.0-alpha-1-Linux" -"3.0-alpha-1-MacOS" +"2.4.12-alpha-2-Linux", +"3.0-alpha-1-Linux", +"3.0-alpha-1-MacOS", "3.0-alpha-1-Windows" ]

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 15 Jun '13

15 Jun '13

commit 3993b0dcc95211c216f8ac5643acf3405dc7a6d7 Merge: 75b3630 633dd7f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 14 22:10:47 2013 -0700 Merge branch 'maint-2.4' build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] Fix a versions parse error spotted by Micah.
by mikeperry＠torproject.org 15 Jun '13

15 Jun '13

commit 633dd7fb876993ab0eb5be76b5c2651647283f8e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 14 22:10:21 2013 -0700 Fix a versions parse error spotted by Micah. Thanks, Micah! --- build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index a535941..73f675c 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -5,8 +5,8 @@ "2.3.25-9-Linux", "2.4.12-alpha-2-MacOS", "2.4.12-alpha-2-Windows", -"2.4.12-alpha-2-Linux" -"3.0-alpha-1-Linux" -"3.0-alpha-1-MacOS" +"2.4.12-alpha-2-Linux", +"3.0-alpha-1-Linux", +"3.0-alpha-1-MacOS", "3.0-alpha-1-Windows" ]

1 0

[ooni-probe/develop] Merge pull request #82 from aagbsn/feature/add-obfsproxy-bridges
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 4164537e9917e77670968eedde0e18a13d1eb1f7 Merge: 05346a3 9b25111 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jun 13 05:28:54 2013 -0700 Merge pull request #82 from aagbsn/feature/add-obfsproxy-bridges Add bridge and obfsproxy support to director when starting Tor ooni/director.py | 16 ++++++++++++++++ ooniprobe.conf.sample | 1 + 2 files changed, 17 insertions(+)

1 0

[ooni-probe/develop] Bump ooni-probe to version 0.0.12
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit c17e69ccec16d7e99f36e9b3fd04f63a4feb59e2 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jun 8 01:22:54 2013 +0200 Bump ooni-probe to version 0.0.12 --- ooni/__init__.py | 2 +- setup.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index cc4bf03..2e79cd5 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -9,7 +9,7 @@ from . import templates from . import utils __author__ = "Arturo Filastò" -__version__ = "0.0.11" +__version__ = "0.0.12" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', diff --git a/setup.py b/setup.py index e336e08..c5329d8 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ #!/usr/bin/env python #-*- coding: utf-8 -*- +from ooni import __version__ from setuptools import setup install_requires = [ @@ -22,7 +23,7 @@ with open('requirements.txt') as f: setup( name="ooni-probe", - version="0.0.11", + version=__version__, author="Arturo Filastò", author_email = "art(a)torproject.org", url="https://ooni.torproject.org/",

1 0

[ooni-probe/develop] Fix breakage in setup.py
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 05346a3a6df9a432cddd6d9f4eea7e260c57960f Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jun 8 01:29:07 2013 +0200 Fix breakage in setup.py --- ooni/__init__.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 2e79cd5..16fa9d7 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,13 +1,5 @@ # -*- encoding: utf-8 -*- -from . import config -from . import kit -from . import nettest -from . import oonicli -from . import reporter -from . import templates -from . import utils - __author__ = "Arturo Filastò" __version__ = "0.0.12"

1 0

[ooni-probe/develop] Merge pull request #86 from hellais/feature/close_report
by isis＠torproject.org 15 Jun '13

15 Jun '13

commit 7c93d4adeb0faa1b2df245507a30be31212fa37c Merge: 7f786a6 d98ea4c Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Jun 7 15:48:08 2013 -0700 Merge pull request #86 from hellais/feature/close_report Feature/close report ooni/director.py | 9 +++++---- ooni/reporter.py | 11 ++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-)

1 0