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

[metrics-lib/master] Support bridge-ip-transports lines in extra-infos.
by karsten＠torproject.org 20 Apr '13

20 Apr '13

commit b58211e577fa1d685f4f3c802fcd30e2c21700f8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 19 20:57:31 2013 +0200 Support bridge-ip-transports lines in extra-infos. --- .../torproject/descriptor/ExtraInfoDescriptor.java | 8 +++++++ .../descriptor/impl/ExtraInfoDescriptorImpl.java | 18 +++++++++++++- .../impl/ExtraInfoDescriptorImplTest.java | 23 ++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/org/torproject/descriptor/ExtraInfoDescriptor.java index e57febe..1478a4a 100644 --- a/src/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -248,6 +248,14 @@ public interface ExtraInfoDescriptor extends Descriptor { * bridge IP version statistics are included. */ public SortedMap<String, Integer> getBridgeIpVersions(); + /* Return statistics on client IP addresses with map keys being + * pluggable transport names, e.g., "obfs2" or "obfs3" for known + * transports, "<OR>" for no transport, or "<??>" for an unknown + * transport, and map values being the number of unique IP addresses + * rounded up to the nearest multiple of 8, or null if no bridge IP + * transport statistics are included. */ + public SortedMap<String, Integer> getBridgeIpTransports(); + /* Return the (possibly empty) list of transports supported by this * bridge. */ public List<String> getTransports(); diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index d7dfd79..9bd9a9b 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -170,6 +170,8 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl this.parseBridgeStatsIpsLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("bridge-ip-versions")) { this.parseBridgeIpVersionsLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("bridge-ip-transports")) { + this.parseBridgeIpTransportsLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("transport")) { this.parseTransportLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("router-signature")) { @@ -585,8 +587,14 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl private void parseBridgeIpVersionsLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { - this.bridgeIpVersions = ParseHelper.parseCommaSeparatedKeyValueList(line, - partsNoOpt, 1, 2); + this.bridgeIpVersions = ParseHelper.parseCommaSeparatedKeyValueList( + line, partsNoOpt, 1, 2); + } + + private void parseBridgeIpTransportsLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + this.bridgeIpTransports = ParseHelper.parseCommaSeparatedKeyValueList( + line, partsNoOpt, 1, 0); } private void parseTransportLine(String line, String lineNoOpt, @@ -911,6 +919,12 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl new TreeMap<String, Integer>(this.bridgeIpVersions); } + private SortedMap<String, Integer> bridgeIpTransports; + public SortedMap<String, Integer> getBridgeIpTransports() { + return this.bridgeIpTransports == null ? null : + new TreeMap<String, Integer>(this.bridgeIpTransports); + } + private List<String> transports = new ArrayList<String>(); public List<String> getTransports() { return new ArrayList<String>(this.transports); diff --git a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index e1b19f8..569ce06 100644 --- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -649,6 +649,15 @@ public class ExtraInfoDescriptorImplTest { return DescriptorBuilder.createWithBridgeStatsLines( bsb.buildBridgeStatsLines()); } + private String bridgeIpTransportsLine = "bridge-ip-transports " + + "<OR>=8,obfs2=792,obfs3=1728"; + private static ExtraInfoDescriptor createWithBridgeIpTransportsLine( + String line) throws DescriptorParseException { + BridgeStatsBuilder bsb = new BridgeStatsBuilder(); + bsb.bridgeIpTransportsLine = line; + return DescriptorBuilder.createWithBridgeStatsLines( + bsb.buildBridgeStatsLines()); + } private static ExtraInfoDescriptor createWithDefaultLines() throws DescriptorParseException { return DescriptorBuilder.createWithBridgeStatsLines( @@ -665,6 +674,9 @@ public class ExtraInfoDescriptorImplTest { if (this.bridgeIpVersionsLine != null) { sb.append(this.bridgeIpVersionsLine + "\n"); } + if (this.bridgeIpTransportsLine != null) { + sb.append(this.bridgeIpTransportsLine + "\n"); + } String lines = sb.toString(); if (lines.endsWith("\n")) { lines = lines.substring(0, lines.length() - 1); @@ -1271,6 +1283,11 @@ public class ExtraInfoDescriptorImplTest { assertEquals(8, ver.get("v4").intValue()); assertEquals(16, ver.get("v6").intValue()); assertFalse(ver.containsKey("v8")); + SortedMap<String, Integer> trans = descriptor.getBridgeIpTransports(); + assertNotNull(trans); + assertEquals(8, trans.get("<OR>").intValue()); + assertEquals(792, trans.get("obfs2").intValue()); + assertEquals(1728, trans.get("obfs3").intValue()); } @Test(expected = DescriptorParseException.class) @@ -1293,6 +1310,12 @@ public class ExtraInfoDescriptorImplTest { "bridge-ip-versions v4=24.5"); } + public void testBridgeIpTransportsDouble() + throws DescriptorParseException { + BridgeStatsBuilder.createWithBridgeIpTransportsLine( + "bridge-ip-transports obfs2=24.5"); + } + @Test() public void testRouterSignatureOpt() throws DescriptorParseException {

1 0

[tlsdate/master] move note to INSTALL
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 6d57ace95ba4a9e3cf8d3a575853dae1c0525687 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 17:55:00 2013 -0700 move note to INSTALL --- INSTALL | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index d4a78a7..5f34cd4 100644 --- a/INSTALL +++ b/INSTALL @@ -47,6 +47,12 @@ On Debian Gnu/Linux sid/unstable: apt-get install tlsdate +On Debian GNU/Linux and related systems, we provide an init.d script that +controls the tlsdated daemon. It will notice network changes and regularly +invoke tlsdate to keep the clock in sync. Start it like so: + + /etc/init.d/tlsdate start + On ChromeOS: tlsdate is part of the ChromeOS TCB; no install needed

1 0

[tlsdate/master] Lets integrate an image that shows build status
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit be0d8e4042e96ec0e5a1dd851ecdc9c7e58c0acf Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 17:42:17 2013 -0700 Lets integrate an image that shows build status --- HACKING | 104 --------------------------------------------------------- HACKING.md | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 104 deletions(-) diff --git a/HACKING b/HACKING deleted file mode 100644 index b11ce31..0000000 --- a/HACKING +++ /dev/null @@ -1,104 +0,0 @@ -Please feel free to contribute patches; here are the basic guidelines to hack -along with us! - -Please work from a git tree by cloning the repo: - - git clone https://github.com/ioerror/tlsdate.git - -Please file bugs on the tlsdate issue tracker: - - https://github.com/ioerror/tlsdate/issues - -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 - http://build.chromium.org/p/chromiumos/waterfall - -White Space: - - Spaces only, no tabs; all tabs must die - No stray spaces at the end of lines - Generally try not to add excessive empty white space - -Documentation: - - Document all functions with doxygen style comments - -Ensuring Correctness: - - Test your patches and ensure: - - No compiler warnings or errors - No linker warnings or errors - - Test your improved copy of tlsdate extensively - -Security: - - tlsdate is security sensitive - please consider where you add code and in - what context it will run. When possible, run with the least privilege as is - possible. - -Proactively find bugs: - - Run your copy of tlsdate under valgrind - -Weird but meaningful conventions are prefered in tlsdate. We prefer attention -to detail: - - if ( NULL == foo (void) ) - { - bar (void); - } - -Over quick, hard to read and potentilly incorrect: - - if (foo(void)==NULL)) - bar(); - -Define magic numbers and explain their origin: - - // As taken from RFC 3.14 - #define MAGIC_NUMBER 23 // This goes in foo.h - ptr = malloc (MAGIC_NUMBER); - -Rather than just throwing them about in code: - - ptr = malloc (23); - -It is almost always prefered to use dynamically allocated memory: - - widget_ptr = malloc (WIDGET_SIZE); - -Try to avoid static allocations like the following: - - char widget[WIDGET_SIZE]; - -Try to use unsigned values unless an API requires signed values: - - uint32_t server_time_s; - -Please provide relevant CHANGELOG entries for all changes. -Please remove items from the TODO file as they are completed. -Please provide unittest cases. - -When submitting patches via email, please use `git format-patch` to format -patches: - - git format-patch 9a61fcba9bebc3fa2d91c9f79306bf316c59cbcc - -Email patches with a GnuPG signature whenever possible. - -When applying patches, please use `git am` to apply patches: - - git am -i 0001-add-TODO-item.patch - -If `git format-patch` is not possible, please send a unified diff. - -When in doubt, please consult the Tor HACKING guide: - - https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/HACKING - diff --git a/HACKING.md b/HACKING.md new file mode 100644 index 0000000..b069e07 --- /dev/null +++ b/HACKING.md @@ -0,0 +1,108 @@ +Please feel free to contribute patches; here are the basic guidelines to hack +along with us! + +Please work from a git tree by cloning the repo: + + git clone https://github.com/ioerror/tlsdate.git + +Please file bugs on the tlsdate issue tracker: + + https://github.com/ioerror/tlsdate/issues + +Please use the github pull request feature when possible. + +The current build status is available as a handy image: + +[![Build Status](https://secure.travis-ci.org/ioerror/tlsdate.png?branch=master)](ht… + +Continuous integration is available for a number of platforms: + + https://jenkins.torproject.org/job/tlsdate-ci-linux/ + https://travis-ci.org/ioerror/tlsdate + http://build.chromium.org/p/chromiumos/waterfall + +White Space: + + Spaces only, no tabs; all tabs must die + No stray spaces at the end of lines + Generally try not to add excessive empty white space + +Documentation: + + Document all functions with doxygen style comments + +Ensuring Correctness: + + Test your patches and ensure: + + No compiler warnings or errors + No linker warnings or errors + + Test your improved copy of tlsdate extensively + +Security: + + tlsdate is security sensitive - please consider where you add code and in + what context it will run. When possible, run with the least privilege as is + possible. + +Proactively find bugs: + + Run your copy of tlsdate under valgrind + +Weird but meaningful conventions are prefered in tlsdate. We prefer attention +to detail: + + if ( NULL == foo (void) ) + { + bar (void); + } + +Over quick, hard to read and potentilly incorrect: + + if (foo(void)==NULL)) + bar(); + +Define magic numbers and explain their origin: + + // As taken from RFC 3.14 + #define MAGIC_NUMBER 23 // This goes in foo.h + ptr = malloc (MAGIC_NUMBER); + +Rather than just throwing them about in code: + + ptr = malloc (23); + +It is almost always prefered to use dynamically allocated memory: + + widget_ptr = malloc (WIDGET_SIZE); + +Try to avoid static allocations like the following: + + char widget[WIDGET_SIZE]; + +Try to use unsigned values unless an API requires signed values: + + uint32_t server_time_s; + +Please provide relevant CHANGELOG entries for all changes. +Please remove items from the TODO file as they are completed. +Please provide unittest cases. + +When submitting patches via email, please use `git format-patch` to format +patches: + + git format-patch 9a61fcba9bebc3fa2d91c9f79306bf316c59cbcc + +Email patches with a GnuPG signature whenever possible. + +When applying patches, please use `git am` to apply patches: + + git am -i 0001-add-TODO-item.patch + +If `git format-patch` is not possible, please send a unified diff. + +When in doubt, please consult the Tor HACKING guide: + + https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/HACKING +

1 0

[tlsdate/master] Add note on hardening
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 1f379d4ccac0cb0928941c83180d78ff9c72867f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 14:48:09 2013 -0700 Add note on hardening --- HARDENING | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/HARDENING b/HARDENING index 7d623e7..67b762c 100644 --- a/HARDENING +++ b/HARDENING @@ -3,10 +3,22 @@ Platforms offer varying security features; we'd like to support the best. This is a document that notes which security hardening we have implemented and which things we'd like to see implemented for various platforms. We specifically address exploitation mitigation and containment; security issues -such as x509 certification validation are not addressed here. Patches, +such as x509 certification validation are not addressed here, yet. Patches, suggestions and improvements are welcome! We always want the strongest set of options by default on each supported platform. +We attempt to use the C programming language correctly and in a standard way. +We do however use some compiler specific options such as defining integer +wrapping because we believe the practical benefit outweights the implied risks. +As such, we prefer to be explicit rather than implicit in our casting or other +possible ambiguity. + +We should treat all compiler and linker warnings as fatal errors. Currently, +consider autotools warnings to be an exception as we would like to support +platforms imperfectly rather than not at all. We generally wish to support +autotools bootstrapping on all of our supported platforms. This is not possible +on Plan 9. Currently autotools will complain on the BSD systems. + On all platforms we attempt to support available compiler hardening and linking options. Please do not disable these options. Additional compiler and linker hardening options are welcome and the current options are implemented in the @@ -18,7 +30,8 @@ On all platforms, we attempt to switch from the administrative user to an unimportant role account which shares data with no other processes. If we start as any user other than an administrative user, we will likely be unable to switch to our normal unprivileged account. These users are defined at -`configure` time. +`configure` time. It is most effective if such a user is not the traditional +'nobody' or group 'nogroup' as is often the tradition. In addition to the above hardening options, we have tried to extend our hardening when the platform supports it. Each additional security measure that

1 0

[tlsdate/master] Update the README to use the current git tip
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit 7a33632a3283a95582b3e385c59b1fb2cc9fd06b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 18:08:49 2013 -0700 Update the README to use the current git tip --- README | 68 +++++++++++++++++---------------------------------------------- 1 files changed, 19 insertions(+), 49 deletions(-) diff --git a/README b/README index 8e907d3..1c9e793 100644 --- a/README +++ b/README @@ -14,70 +14,40 @@ invoke tlsdate to keep the clock in sync. Start it like so: Here is an example an unprivileged user fetching the remote time: - % tlsdate -v -V -n - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = www.ptb.de:443 - V: time is currently 1342197117.577381 - V: using TLSv1_client_method() - V: SSL certificate verification passed - V: server time 1342197117 (difference is about 0 s) was fetched in 705 ms - Fri Jul 13 18:31:57 CEST 2012 + % tlsdate -V -n -H encrypted.google.com + Fri Apr 19 17:56:46 PDT 2013 -This is an example run - starting as root and dropping to nobody: +This is an example run - starting as root and dropping to nobody, setting the +clock and printing it: + + % sudo tlsdate -V + Fri Apr 19 17:57:49 PDT 2013 - % sudo ./tlsdate -v - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = www.ptb.de:443 - V: time is currently 1342197222.273552 - V: using TLSv1_client_method() - V: SSL certificate verification passed - V: server time 1342197222 (difference is about 0 s) was fetched in 520 ms - V: setting time succeeded Here is an example with a custom host and custom port without verification: % sudo tlsdate -v --skip-verification -p 80 -H rgnx.net - V: tlsdate version 0.0.1 + V: tlsdate version 0.0.6 V: We were called with the following arguments: V: disable SSL certificate check host = rgnx.net:80 WARNING: Skipping certificate verification! - V: time is currently 1342197285.298607 + V: time is currently 1366419507.456647065 + V: time is greater than RECENT_COMPILE_DATE V: using TLSv1_client_method() + V: Using OpenSSL for SSL + V: opening socket to rgnx.net:80 V: Certificate verification skipped! - V: server time 1342197286 (difference is about -1 s) was fetched in 765 ms + V: public key is ready for inspection + V: key type: EVP_PKEY_RSA + V: keybits: 1024 + V: key length appears safe + V: server time 1366419508 (difference is about -1 s) was fetched in 338 ms V: setting time succeeded -Here is an example of a false ticker that is detected and rejected: - - % sudo tlsdate -v -H facebook.com - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = facebook.com:443 - V: time is currently 1342197379.931852 - V: using TLSv1_client_method() - V: SSL certificate verification passed - V: server time 2693501503 (difference is about -1351304124 s) was fetched in 724 ms - remote server is a false ticker from the future! - Here is an example where a system may not have any kind of RTC at boot. Do the time warp to restore sanity and do so with a leap of faith: - % sudo tlsdate -v -V -l -t - V: tlsdate version 0.0.1 - V: We were called with the following arguments: - V: validate SSL certificates host = www.ptb.de:443 - V: RECENT_COMPILE_DATE is 1342407042.000000 - V: time is currently 1342488229.659967 - V: time is greater than RECENT_COMPILE_DATE - V: using TLSv1_client_method() - V: freezing time for x509 verification - V: remote peer provided: 1342488230, prefered over compile time: 1342407042 - V: freezing time with X509_VERIFY_PARAM_set_time - V: SSL certificate verification passed - V: server time 1342488230 (difference is about -1 s) was fetched in 791 ms - Mon Jul 16 18:23:50 PDT 2012 - V: setting time succeeded + % sudo tlsdate -V -l -t + Fri Apr 19 18:08:03 PDT 2013

1 0

[flashproxy/master] Add a timeout for reading HTTP requests after connect.
by dcf＠torproject.org 19 Apr '13

19 Apr '13

commit e201fabb944dd77a21913cbcc26dcb9dd262fcd9 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 19 18:03:21 2013 -0700 Add a timeout for reading HTTP requests after connect. This is a try at fixing #8626, "too many open files." Before this, a client could just connect to the port and wait forever before sending the WebSocket request, using up a descriptor. Once the WebSocket handshake is completed, you can still keep the socket open forever, but that's more like intended behavior. --- ChangeLog | 2 ++ websocket-transport/websocket-server.go | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c24a31..e0c11db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Changes in version 1.0 o Fixed badge rendering for a certain combination of Chrome and AdBlock Plus. Patch by Arlo Breault. Fixes bug 8300. + o There is now a 10-second HTTP request timeout in websocket-server. + Changes in version 0.12 o The new flashproxy-reg-url program prints a URL which, when requested, causes an address to be registered with the facilitator. diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index aa4fe57..1abff87 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -19,6 +19,8 @@ import ( "time" ) +const requestTimeout = 10 * time.Second + var logFile = os.Stderr var ptInfo PtServerInfo @@ -157,6 +159,8 @@ func proxy(local *net.TCPConn, conn *websocketConn) { } func websocketHandler(ws *Websocket) { + // Undo timeouts on HTTP request handling. + ws.Conn.SetDeadline(time.Time{}) conn := NewWebsocketConn(ws) handlerChan <- 1 @@ -183,8 +187,11 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { config.Subprotocols = []string{"base64"} // 16 kilobytes, possibly base64-encoded. config.MaxMessageSize = 16*1024*4/3 + 1 - http.Handle("/", config.Handler(websocketHandler)) - err = http.Serve(ln, nil) + s := &http.Server{ + Handler: config.Handler(websocketHandler), + ReadTimeout: requestTimeout, + } + err = s.Serve(ln) if err != nil { Log("http.Serve: " + err.Error()) }

1 0

[tlsdate/master] Add libtool to .travis.yml
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit c68c5dc9365665ffd14463cae5f424e1c99cb885 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 10:24:51 2013 -0700 Add libtool to .travis.yml --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd9d2fa..57e3045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev dh-apparmor hardening-wrapper libssl-dev autoconf automake pkg-config + - sudo apt-get install -qq autotools-dev dh-apparmor hardening-wrapper libssl-dev autoconf automake pkg-config libtool script: ./configure && make && make test

1 0

[torsocks/master] Add libtool to .travis.yml
by ioerror＠torproject.org 19 Apr '13

19 Apr '13

commit b41ac004a249fed9b9ba95ec2c6603641db4525d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Apr 19 10:25:52 2013 -0700 Add libtool to .travis.yml --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index bfeeb01..75791e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev pkg-config hardening-wrapper automake autoconf + - sudo apt-get install -qq autotools-dev pkg-config hardening-wrapper automake autoconf libtool script: ./configure && make

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Apr '13

19 Apr '13

commit f4b532a309682e3e3a0d88c90c7eca32f296f0d0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 19 16:45:03 2013 +0000 Update translations for bridgedb --- zh_CN/bridgedb.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zh_CN/bridgedb.po b/zh_CN/bridgedb.po index 5584846..8f1517c 100644 --- a/zh_CN/bridgedb.po +++ b/zh_CN/bridgedb.po @@ -11,7 +11,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: 2013-04-19 15:40+0000\n" +"PO-Revision-Date: 2013-04-19 16:27+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -64,33 +64,33 @@ msgstr "需如使用以上地址，请打开 Vidalia 网络设置，选中“我 #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "当前无可用的网桥中继" +msgstr "" #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" -msgstr "请将你的浏览器升级至 Firefox" +msgstr "" #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "请输入图中的两个单词" +msgstr "" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "第 1 步" +msgstr "" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "获取 %s Tor Browser Bundle %s" +msgstr "" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "第 2 步" +msgstr "" #: lib/bridgedb/templates/index.html:15 #, python-format msgid "Get %s bridges %s" -msgstr "获取 %s网桥%s" +msgstr "获取 %s bridges %s" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" @@ -99,4 +99,4 @@ msgstr "第 3 步" #: lib/bridgedb/templates/index.html:21 #, python-format msgid "Now %s add the bridges to Tor %s" -msgstr "现在可%s 将网桥添加到 Tor %s" +msgstr ""

1 0

[stem/master] Extra spaces were inserted into process names via set_process_name()
by atagar＠torproject.org 19 Apr '13

19 Apr '13

commit 8adc55c0139ff9f0925541be1254bea4767716ed Author: Tomasz Kunikowski <tomasz.kunikowski(a)gmail.com> Date: Thu Apr 18 23:54:25 2013 +0200 Extra spaces were inserted into process names via set_process_name() After running set_process_name() ps would report spaces within our process name. For instance, when running our integ tests our name would become... p y t h o n . / r u n _ t e s Fixed thanks to ragwater, who figured out that ctypes.memmove() wanted unicode rather than byte content... https://trac.torproject.org/8631 --- stem/util/system.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 0a94b57..bea6222 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -799,7 +799,8 @@ def _set_argv(process_name): zero_size = max(len(current_name), len(process_name)) ctypes.memset(argc.contents, 0, zero_size + 1) # null terminate the string's end - ctypes.memmove(argc.contents, process_name, len(process_name)) + process_name_encoded = process_name.encode('utf8') + ctypes.memmove(argc.contents, process_name_encoded, len(process_name)) _PROCESS_NAME = process_name

1 0