March 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Rearrange logging calls during pygeoip import in HTTPServer.py.
by isis＠torproject.org 20 Mar '14

20 Mar '14

commit e2044209095f1a00ae65c998dc93f64796dd9e6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 22:56:51 2014 +0000 Rearrange logging calls during pygeoip import in HTTPServer.py. --- lib/bridgedb/HTTPServer.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 2744193..96ee029 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -72,12 +72,10 @@ try: # geoip-database packages. import pygeoip geoip = pygeoip.GeoIP(_geoipdb, flags=pygeoip.MEMORY_CACHE) + logging.info("GeoIP database loaded") except Exception as err: - logging.debug("Error while loading geoip module: %r" % err) - logging.warn("GeoIP database not found") + logging.warn("Error while loading geoip module: %r" % err) geoip = None -else: - logging.info("GeoIP database loaded") def replaceErrorPage(error, template_name=None):

1 0

[bridgedb/develop] Move HTTPServer.geoipdb to _geoipdb and outside try function.
by isis＠torproject.org 20 Mar '14

20 Mar '14

commit e6e7552e8c8207ea04c42d209ec735a3c12b2238 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 22:53:30 2014 +0000 Move HTTPServer.geoipdb to _geoipdb and outside try function. * If it's outside the try function, it's easier to change from other modules (as well as for unittests). --- lib/bridgedb/HTTPServer.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index e9abc78..89989eb 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -59,19 +59,19 @@ lookup = TemplateLookup(directories=[template_root], collection_size=500) +_geoipdb = '/usr/share/GeoIP/GeoIP.dat' + try: # Make sure we have the database before trying to import the module: - geoipdb = '/usr/share/GeoIP/GeoIP.dat' - if not os.path.isfile(geoipdb): + if not os.path.isfile(_geoipdb): raise EnvironmentError("Could not find %r. On Debian-based systems, "\ "please install the geoip-database package." - % geoipdb) + % _geoipdb) # This is a "pure" python version which interacts with the Maxmind GeoIP # API (version 1). It require, in Debian, the libgeoip-dev and # geoip-database packages. import pygeoip - geoip = pygeoip.GeoIP(geoipdb, flags=pygeoip.MEMORY_CACHE) - + geoip = pygeoip.GeoIP(_geoipdb, flags=pygeoip.MEMORY_CACHE) except Exception as err: logging.debug("Error while loading geoip module: %r" % err) logging.warn("GeoIP database not found")

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit 25d0038131a96ae82e5ef015058e88486fc02a2b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 19 23:15:58 2014 +0000 Update translations for tails-perl5lib_completed --- lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt.po b/lt.po index 4b81da7..73efc6d 100644 --- a/lt.po +++ b/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2014-03-19 21:44+0000\n" +"PO-Revision-Date: 2014-03-19 23:07+0000\n" "Last-Translator: TylQuest <tylquest(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit 12630e94d0520bfac2c7611552a3904636e52d61 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 19 23:15:56 2014 +0000 Update translations for tails-perl5lib --- lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt.po b/lt.po index 4b81da7..73efc6d 100644 --- a/lt.po +++ b/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2014-03-19 21:44+0000\n" +"PO-Revision-Date: 2014-03-19 23:07+0000\n" "Last-Translator: TylQuest <tylquest(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit b66df0c1801e28e9886554c9d8477aaddc39713c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 19 23:15:52 2014 +0000 Update translations for tails-iuk --- lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt.po b/lt.po index 2a185d1..85b84b6 100644 --- a/lt.po +++ b/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-19 21:41+0000\n" +"PO-Revision-Date: 2014-03-19 23:07+0000\n" "Last-Translator: TylQuest <tylquest(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit 27070e853150a62240a1f768273554b7a46bf27a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 19 23:15:06 2014 +0000 Update translations for gettor --- lt/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/gettor.po b/lt/gettor.po index b9b40d4..ac217d8 100644 --- a/lt/gettor.po +++ b/lt/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-03-19 21:36+0000\n" +"PO-Revision-Date: 2014-03-19 23:06+0000\n" "Last-Translator: TylQuest <tylquest(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Mar '14

20 Mar '14

commit a2cc2e0ae83f433969fe3137d35c6aa6a29f024f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 19 23:15:02 2014 +0000 Update translations for bridgedb --- lt/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index c64b5d1..e84f404 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ 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+0000\n" -"PO-Revision-Date: 2014-03-19 21:35+0000\n" +"PO-Revision-Date: 2014-03-19 23:06+0000\n" "Last-Translator: TylQuest <tylquest(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] missing colon
by arma＠torproject.org 20 Mar '14

20 Mar '14

commit b16344d945cecde2e85b15a8bf9251c7fe3ae365 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 19 19:05:42 2014 -0400 missing colon --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 693c770..a84c380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,7 +67,7 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". Fixes bug 10929; bugfix on 0.2.2.9-alpha. Patch from Dana Koch. - o Minor bugfixes (unit tests) + o Minor bugfixes (unit tests): - Fix a small bug in the unit tests that might have made the tests call 'chmod' with an uninitialized bitmask. Fixes bug 10928; bugfix on 0.2.5.1-alpha. Patch from Dana Koch.

1 0

[tor/master] sort stanzas by interest, and sort by version within stanzas
by arma＠torproject.org 20 Mar '14

20 Mar '14

commit 89154380acbd5155f261fe1eeb8973df7a0d687c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 19 19:11:25 2014 -0400 sort stanzas by interest, and sort by version within stanzas (users want to know about client fixes before they want to know about unit test fixes.) --- ChangeLog | 61 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index a84c380..d5d65f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,13 +38,8 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? information will help bridge operators look up their bridge in Globe and similar tools. Resolves ticket 10884. - Improve the message that Tor displays when running as a bridge - using pluggable transports without an Extended ORPort - listener. Also, log the message in the log file too. Resolves - ticket 11043. - - Stop giving annoying warning messages when we decide not to launch - a pluggable transport proxy that we don't need (because there are - no bridges configured to use it). Resolves ticket 5018; bugfix - on 0.2.5.2-alpha. + using pluggable transports without an Extended ORPort listener. + Also, log the message in the log file too. Resolves ticket 11043. o Minor features (other): - Add a new option, PredictedPortsRelevanceTime, to control how long @@ -67,15 +62,11 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". Fixes bug 10929; bugfix on 0.2.2.9-alpha. Patch from Dana Koch. - o Minor bugfixes (unit tests): - - Fix a small bug in the unit tests that might have made the tests - call 'chmod' with an uninitialized bitmask. Fixes bug 10928; - bugfix on 0.2.5.1-alpha. Patch from Dana Koch. - o Minor bugfixes (client): - - Fix connections to IPv6 addresses over SOCKS5. Previously, we were - generating incorrect SOCKS5 responses, and confusing client - applications. Fixes bug 10987; bugfix on 0.2.4.7-alpha. + - Improve the log message when we can't connect to a hidden service + because all of the hidden service directory nodes hosting its + descriptor are excluded. Improves on our fix for bug 10722, which + was a bugfix on 0.2.0.10-alpha. - Raise a control port warning when we fail to connect to all of our bridges. Previously, we didn't inform the controller, and the bootstrap process would stall. Fixes bug 11069; bugfix on @@ -86,27 +77,30 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? was problematic, since there was no feedback for the user. To do a clean shutdown, controllers should send an INT signal and give Tor a chance to clean up. Fixes bug 10449; bugfix on 0.2.2.28-beta. - - Improve the log message when we can't connect to a hidden service - because all of the hidden service directory nodes hosting its - descriptor are excluded. Improves on our fix for bug 10722, which - was a bugfix on 0.2.0.10-alpha. - Stop attempting to connect to bridges before our pluggable transports are configured (harmless but resulted in some erroneous log messages). Fixes bug 11156; bugfix on 0.2.3.2-alpha. + - Fix connections to IPv6 addresses over SOCKS5. Previously, we were + generating incorrect SOCKS5 responses, and confusing client + applications. Fixes bug 10987; bugfix on 0.2.4.7-alpha. o Minor bugfixes (relays and bridges): + - Avoid crashing on a malformed resolv.conf file when running a + relay using Libevent 1. Fixes bug 8788; bugfix on 0.1.1.23. - Non-exit relays no longer launch mock DNS requests to check for DNS hijacking. This has been unnecessary since 0.2.1.7-alpha, when non-exit relays stopped servicing DNS requests. Fixes bug 965; bugfix on 0.2.1.7-alpha. Patch from Matt Pagan. - - Avoid crashing on a malformed resolv.conf file when running a - relay using Libevent 1. Fixes bug 8788; bugfix on 0.1.1.23. - - Give the correct URL in the warning message when trying to run a - relay on an ancient version of Windows. Fixes bug 9393. - - Bridges now never collect statistics that were designed for - relays. Fixes bug 5824; bugfix on 0.2.3.8-alpha. - Bridges now report complete directory request statistics. Related to bug 5824; bugfix on 0.2.2.1-alpha. + - Bridges now never collect statistics that were designed for + relays. Fixes bug 5824; bugfix on 0.2.3.8-alpha. + - Stop giving annoying warning messages when we decide not to launch + a pluggable transport proxy that we don't need (because there are + no bridges configured to use it). Resolves ticket 5018; bugfix + on 0.2.5.2-alpha. + - Give the correct URL in the warning message when trying to run a + relay on an ancient version of Windows. Fixes bug 9393. o Minor bugfixes (backtrace support): - Support automatic backtraces on more platforms by using the @@ -123,24 +117,29 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? - Fix a compiler warning in format_number_sigsafe(). Bugfix on 0.2.5.2-alpha; patch from Nick Hopper. + o Minor bugfixes (unit tests): + - Fix a small bug in the unit tests that might have made the tests + call 'chmod' with an uninitialized bitmask. Fixes bug 10928; + bugfix on 0.2.5.1-alpha. Patch from Dana Koch. + o Removed code: - Remove all remaining code related to version-0 hidden service descriptors: they have not been in use since 0.2.2.1-alpha. Fixes the rest of bug 10841. o Documentation: + - Document in the manpage that "KBytes" may also be written as + "kilobytes" or "KB", that "Kbits" may also be written as + "kilobits", and so forth. Closes ticket 9222. - Explain that SocksPolicy, DirPolicy, and similar options don't take port arguments. Fixes the other part of ticket 11108. - - Fix the manpage's description of HiddenServiceAuthorizeClient: - the maximum client name length is 16, not 19. Fixes bug 11118; - bugfix on 0.2.1.6-alpha. - Fix a comment about the rend_server_descriptor_t.protocols field to more accurately describe its range. Also, make that field unsigned, to more accurately reflect its usage. Fixes bug 9099; bugfix on 0.2.1.5-alpha. - - Document in the manpage that "KBytes" may also be written as - "kilobytes" or "KB", that "Kbits" may also be written as - "kilobits", and so forth. Closes ticket 9222. + - Fix the manpage's description of HiddenServiceAuthorizeClient: + the maximum client name length is 16, not 19. Fixes bug 11118; + bugfix on 0.2.1.6-alpha. o Code simplifications and refactoring: - Get rid of router->address, since in all cases it was just the

1 0

[tor/master] use the formatting from 0.2.4.21 for the 0.2.4.21 changelog stanza
by arma＠torproject.org 20 Mar '14

20 Mar '14

commit 5de0e08b271f370f628621b3bf2aa080125b88d1 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 19 19:04:35 2014 -0400 use the formatting from 0.2.4.21 for the 0.2.4.21 changelog stanza --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index be29016..693c770 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,8 +61,8 @@ Changes in version 0.2.5.3-alpha - 2014-03-?? o Minor bugfixes (new since 0.2.5.2-alpha, also in 0.2.4.21): - Build without warnings under clang 3.4. (We have some macros that define static functions only some of which will get used later in - the module. Starting with clang 3.4, these give a warning unless - the unused attribute is set on them.) Resolves ticket 10904. + the module. Starting with clang 3.4, these give a warning unless the + unused attribute is set on them.) Resolves ticket 10904. - Fix build warnings about missing "a2x" comment when building the manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py". Fixes bug 10929; bugfix on 0.2.2.9-alpha. Patch from Dana Koch.

1 0