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

[tor-messenger-build/master] Set commit for mingw-w64
by boklm＠torproject.org 13 Mar '15

13 Mar '15

commit bf7a6b4e1a115badc1e2458b1c18c4e2782a862a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 13 09:37:02 2015 +0100 Set commit for mingw-w64 --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 020cb70..31ec1f1 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -2,7 +2,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 #git_hash: 469ed5d227202b373409c8a3b4c1358be39b9983 -git_hash: master +git_hash: bcd8f3f6d3bd4a227e8537010a869ddde711b8f6 version: '[% c("abbrev") %]' remote_docker: 1 lsb_release:

1 0

[goptlib/master] Read the ExtORPort cookie on every call to DialOr.
by yawning＠torproject.org 12 Mar '15

12 Mar '15

commit d9f777f236cb770a44a5f497cb50e17ed7ed1df5 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Mar 12 22:26:30 2015 +0000 Read the ExtORPort cookie on every call to DialOr. This works around tor bug #15240, where the ExtORPort cookie is generated after the pluggable transports are launched, leading to a race condition and DialOr failures. 'ServerInfo.AuthCookie' is deprecated by this change, replaced by 'ServerInfo.AuthCookiePath', however nothing external to goptlib should be using either value in most situations. --- pt.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pt.go b/pt.go index 468440e..d2e7dc1 100644 --- a/pt.go +++ b/pt.go @@ -566,7 +566,7 @@ type ServerInfo struct { Bindaddrs []Bindaddr OrAddr *net.TCPAddr ExtendedOrAddr *net.TCPAddr - AuthCookie []byte + AuthCookiePath string } // Check the server pluggable transports environment, emitting an error message @@ -612,17 +612,10 @@ func ServerSetup(star []string) (info ServerInfo, err error) { return } } - authCookieFilename := getenv("TOR_PT_AUTH_COOKIE_FILE") - if authCookieFilename != "" { - info.AuthCookie, err = readAuthCookieFile(authCookieFilename) - if err != nil { - err = envError(fmt.Sprintf("error reading TOR_PT_AUTH_COOKIE_FILE %q: %s", authCookieFilename, err.Error())) - return - } - } + info.AuthCookiePath = getenv("TOR_PT_AUTH_COOKIE_FILE") // Need either OrAddr or ExtendedOrAddr. - if info.OrAddr == nil && (info.ExtendedOrAddr == nil || info.AuthCookie == nil) { + if info.OrAddr == nil && (info.ExtendedOrAddr == nil || info.AuthCookiePath == "") { err = envError("need TOR_PT_ORPORT or TOR_PT_EXTENDED_SERVER_PORT environment variable") return } @@ -700,12 +693,20 @@ func extOrPortAuthenticate(s io.ReadWriter, info *ServerInfo) error { return err } - expectedServerHash := computeServerHash(info.AuthCookie, clientNonce, serverNonce) + // Work around tor bug #15240 where the auth cookie is generated after + // pluggable transports are launched, leading to a stale cookie getting + // cached forever if it is only read once as part of ServerSetup. + authCookie, err := readAuthCookieFile(info.AuthCookiePath) + if err != nil { + return fmt.Errorf("error reading TOR_PT_AUTH_COOKIE_FILE %q: %s", info.AuthCookiePath, err.Error()) + } + + expectedServerHash := computeServerHash(authCookie, clientNonce, serverNonce) if subtle.ConstantTimeCompare(serverHash, expectedServerHash) != 1 { return fmt.Errorf("mismatch in server hash") } - clientHash = computeClientHash(info.AuthCookie, clientNonce, serverNonce) + clientHash = computeClientHash(authCookie, clientNonce, serverNonce) _, err = s.Write(clientHash) if err != nil { return err @@ -845,7 +846,7 @@ func extOrPortSetup(s io.ReadWriter, addr, methodName string) error { // commands, respectively. If either is "", the corresponding command is not // sent. func DialOr(info *ServerInfo, addr, methodName string) (*net.TCPConn, error) { - if info.ExtendedOrAddr == nil || info.AuthCookie == nil { + if info.ExtendedOrAddr == nil || info.AuthCookiePath == "" { return net.DialTCP("tcp", nil, info.OrAddr) }

1 0

[goptlib/master] Merge branch 'bug15240'
by yawning＠torproject.org 12 Mar '15

12 Mar '15

commit 9b7a7002582f1060703aa85bbbe4a422447d0c6e Merge: e7c3b80 d9f777f Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Mar 12 22:28:45 2015 +0000 Merge branch 'bug15240' Workaround for tor bug #15240. pt.go | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 Mar '15

12 Mar '15

commit b8244ca4693a3adfe8dd269646da59832733cefb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 12 22:15:05 2015 +0000 Update translations for gettor --- bg/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bg/gettor.po b/bg/gettor.po index b1d0c7c..7e933f6 100644 --- a/bg/gettor.po +++ b/bg/gettor.po @@ -13,7 +13,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: 2015-03-12 21:44+0000\n" +"PO-Revision-Date: 2015-03-12 21:51+0000\n" "Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "" +msgstr "За съжаление, не можем да ви отговорим на този адрес. Трябва да си направите\nпоща в GMAIL.COM, YAHOO.COM или YAHOO.CN и изпратете от тамсъобщението си." #: lib/gettor/i18n.py:35 msgid "" @@ -375,7 +375,7 @@ msgstr "" msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." -msgstr "" +msgstr "linux-i386\nТОР браузърен пакет за Линукс, 32 битова версия" #: lib/gettor/i18n.py:238 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 12 Mar '15

12 Mar '15

commit 0b0b04b42f144f9f1fc3cb021e3fdf0113a629b1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 12 21:45:06 2015 +0000 Update translations for gettor --- bg/gettor.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bg/gettor.po b/bg/gettor.po index aa8911a..b1d0c7c 100644 --- a/bg/gettor.po +++ b/bg/gettor.po @@ -5,6 +5,7 @@ # Translators: # Aleksandar Ivanov <ivanov.aleksandar.m(a)gmail.com>, 2013 # aramaic <aramaicbg(a)gmail.com>, 2015 +# Gabriel Radev <gabosss(a)gmail.com>, 2015 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # alexdimitrov <kvikmen(a)gmail.com>, 2013 msgid "" @@ -12,8 +13,8 @@ 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: 2015-01-14 13:41+0000\n" -"Last-Translator: aramaic <aramaicbg(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-12 21:44+0000\n" +"Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +55,7 @@ msgstr "" msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" -msgstr "" +msgstr "Ако имате някакви въпроси или това не работи, може да осъществите връзка с поддръжката на този имейл адрес: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -84,7 +85,7 @@ msgstr "" msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "" +msgstr "ПОЛУЧАВАНЕ НА ПРЕВЕДЕНА ВЕРСИЯ НА ТОР\n=============================================" #: lib/gettor/i18n.py:67 msgid "" @@ -132,7 +133,7 @@ msgstr "Ако не изберете език, ще получите Англи msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "МАЛЪК ТИП ПАКЕТИ\n=====================" #: lib/gettor/i18n.py:97 msgid "" @@ -238,7 +239,7 @@ msgstr "" msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "" +msgstr "БЛОКИРАН ДОСТЪП/ЦЕНЗУРИРАНО\n===================================" #: lib/gettor/i18n.py:160 msgid "" @@ -317,7 +318,7 @@ msgstr "" msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "РАЗАРХИВИРАНЕ НА ФАЙЛОВЕТЕ\n=================================" #: lib/gettor/i18n.py:205 msgid "" @@ -386,7 +387,7 @@ msgstr "" msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." -msgstr "" +msgstr "linux-x86_64:\nТОР браузърен пакет за Линукс, 64 битова версия." #: lib/gettor/i18n.py:244 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Mar '15

12 Mar '15

commit 069544acf322e0328262c8df8d3677092ac9e239 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 12 19:46:16 2015 +0000 Update translations for tails-misc --- cs.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs.po b/cs.po index 9db020b..b926a38 100644 --- a/cs.po +++ b/cs.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-03-12 19:13+0000\n" +"PO-Revision-Date: 2015-03-12 19:41+0000\n" "Last-Translator: Pivoj\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "" +msgstr "<h1>Pomožte nám opravit tuto chybu!</h1>\n<p>Přečtěte si <a href=\"%s\">naše instrukce k reportování chyb</a>.</p>\n<p><strong>Nevkládejte žádné osobní údaje, které nejsou nezbytně nutné!</strong></p>\n<h2>Jak je to s vaší emailovou adresou</h2>\n<p>\nTím že uvedete váš email, nám umožníte, abychom Vás kontaktovali v případě, že bude nutné upřesnit potíže. To je obvykle nutné u většinu ohlášených chyb a pokud by nebylo možné Vás kontaktovat, bylo by vaše hlášení chyby k ničemu. Na druhé straně musíte počítat s tím, že váš poskytovatel připojení nebo provozovatel emailu může emailovou komunikaci odposlechnout a zjistit tak, že používáte Tails.\n</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" @@ -57,7 +57,7 @@ msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "" +msgstr "Doporučuje se aktivovat Persistence pro Electrum. Jinak se veškerá data z Electrum ztratí při každém restartu Tails (včetně např. Bitcoinové peněženky)." #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" @@ -371,7 +371,7 @@ msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Více zde...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Mar '15

12 Mar '15

commit 42d1411f71b93e4e6edb00f6ce203de7cd77abf5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 12 19:15:35 2015 +0000 Update translations for tails-misc --- cs.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cs.po b/cs.po index 698a88e..9db020b 100644 --- a/cs.po +++ b/cs.po @@ -6,6 +6,7 @@ # A5h8d0wf0x <littleslyfoxie28(a)gmail.com>, 2014 # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 +# Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # mxsedlacek, 2014 msgid "" @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-12 19:13+0000\n" +"Last-Translator: Pivoj\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,7 +50,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" -msgstr "" +msgstr "Persistence je pro Electrum vypnuta" #: config/chroot_local-includes/usr/local/bin/electrum:16 msgid "" @@ -60,7 +61,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "Chcete i přesto spustit Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 @@ -450,11 +451,11 @@ msgstr "Nepodařilo se nastavit \"chroot\"" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 msgid "Failed to configure browser." -msgstr "" +msgstr "Nepodařilo se nakonfigurovat prohlížeč." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 msgid "Failed to run browser." -msgstr "" +msgstr "Nepodařilo se spustit prohlížeč." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "I2P failed to start"

1 0

[tor/release-0.2.6] Add link protocol version counts to the heartbeat message
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit d29a8ad564757866dee8d2cbd940c5028a03f2e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 10 10:07:41 2015 -0400 Add link protocol version counts to the heartbeat message Closes ticket 15212 --- changes/ticket15212 | 6 ++++++ src/or/channeltls.c | 3 +++ src/or/connection_or.c | 1 + src/or/rephist.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 4 ++++ src/or/status.c | 4 +++- src/test/test_status.c | 8 +++++++- 7 files changed, 68 insertions(+), 2 deletions(-) diff --git a/changes/ticket15212 b/changes/ticket15212 new file mode 100644 index 0000000..2c41e38 --- /dev/null +++ b/changes/ticket15212 @@ -0,0 +1,6 @@ + o Minor features (heartbeat): + + - On relays, report how many connections we negotiated using each + version of the Tor link protocols. This information will let us + know if removing support for very old versions of the Tor + protocols is harming the network. Closes ticket 15212. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index e194c1c..1cf697c 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -23,6 +23,7 @@ #include "connection_or.h" #include "control.h" #include "relay.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" #include "scheduler.h" @@ -1463,6 +1464,8 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) return; } + rep_hist_note_negotiated_link_proto(highest_supported_version, started_here); + chan->conn->link_proto = highest_supported_version; chan->conn->handshake_state->received_versions = 1; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 85462d8..e0dff1c 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1819,6 +1819,7 @@ connection_tls_finish_handshake(or_connection_t *conn) conn->base_.port, digest_rcvd, 0); } tor_tls_block_renegotiation(conn->tls); + rep_hist_note_negotiated_link_proto(1, started_here); return connection_or_set_state_open(conn); } else { connection_or_change_state(conn, OR_CONN_STATE_OR_HANDSHAKING_V2); diff --git a/src/or/rephist.c b/src/or/rephist.c index 3490882..fe0997c 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3121,6 +3121,50 @@ rep_hist_hs_stats_write(time_t now) return start_of_hs_stats_interval + WRITE_STATS_INTERVAL; } +#define MAX_LINK_PROTO_TO_LOG 4 +static uint64_t link_proto_count[MAX_LINK_PROTO_TO_LOG+1][2]; + +/** Note that we negotiated link protocol version <b>link_proto</b>, on + * a connection that started here iff <b>started_here</b> is true. + */ +void +rep_hist_note_negotiated_link_proto(unsigned link_proto, int started_here) +{ + started_here = !!started_here; /* force to 0 or 1 */ + if (link_proto > MAX_LINK_PROTO_TO_LOG) { + log_warn(LD_BUG, "Can't log link protocol %u", link_proto); + return; + } + + link_proto_count[link_proto][started_here]++; +} + +/** Log a heartbeat message explaining how many connections of each link + * protocol version we have used. + */ +void +rep_hist_log_link_protocol_counts(void) +{ + log_notice(LD_HEARTBEAT, + "Since startup, we have initiated " + U64_FORMAT" v1 connections, " + U64_FORMAT" v2 connections, " + U64_FORMAT" v3 connections, and " + U64_FORMAT" v4 connections; and received " + U64_FORMAT" v1 connections, " + U64_FORMAT" v2 connections, " + U64_FORMAT" v3 connections, and " + U64_FORMAT" v4 connections.", + U64_PRINTF_ARG(link_proto_count[1][1]), + U64_PRINTF_ARG(link_proto_count[2][1]), + U64_PRINTF_ARG(link_proto_count[3][1]), + U64_PRINTF_ARG(link_proto_count[4][1]), + U64_PRINTF_ARG(link_proto_count[1][0]), + U64_PRINTF_ARG(link_proto_count[2][0]), + U64_PRINTF_ARG(link_proto_count[3][0]), + U64_PRINTF_ARG(link_proto_count[4][0])); +} + /** Free all storage held by the OR/link history caches, by the * bandwidth history arrays, by the port history, or by statistics . */ void diff --git a/src/or/rephist.h b/src/or/rephist.h index 42710c4..f94b4e8 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -108,5 +108,9 @@ void rep_hist_stored_maybe_new_hs(const crypto_pk_t *pubkey); void rep_hist_free_all(void); +void rep_hist_note_negotiated_link_proto(unsigned link_proto, + int started_here); +void rep_hist_log_link_protocol_counts(void); + #endif diff --git a/src/or/status.c b/src/or/status.c index 2acdd28..8f7be0a 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -136,8 +136,10 @@ log_heartbeat(time_t now) "Average packaged cell fullness: %2.3f%%. " "TLS write overhead: %.f%%", fullness_pct, overhead_pct); - if (public_server_mode(options)) + if (public_server_mode(options)) { rep_hist_log_circuit_handshake_stats(now); + rep_hist_log_link_protocol_counts(); + } circuit_log_ancient_one_hop_circuits(1800); diff --git a/src/test/test_status.c b/src/test/test_status.c index 0aa82ca..3888a1b 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -337,7 +337,7 @@ NS(test_main)(void *arg) actual = log_heartbeat(0); tt_int_op(actual, OP_EQ, expected); - tt_int_op(CALLED(logv), OP_EQ, 4); + tt_int_op(CALLED(logv), OP_EQ, 5); done: NS_UNMOCK(tls_get_write_overhead_ratio); @@ -430,6 +430,12 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_int_op(va_arg(ap, int), OP_EQ, 1); /* handshakes assigned (NTOR) */ tt_int_op(va_arg(ap, int), OP_EQ, 1); /* handshakes requested (NTOR) */ break; + case 4: + tt_int_op(severity, OP_EQ, LOG_NOTICE); + tt_int_op(domain, OP_EQ, LD_HEARTBEAT); + tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"), + OP_NE, NULL); + break; default: tt_abort_msg("unexpected call to logv()"); // TODO: prettyprint args break;

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit eecd410984e3f1741dda877fe482e082a41db700 Merge: a00d07a 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:25 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 changes/bug15064 | 4 ++++ changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ src/or/connection_edge.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 12 Mar '15

12 Mar '15

commit 8a060d8643ff5a84cd8593f49af8221ef0855d36 Merge: 1a1d431 eecd410 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 12 12:27:42 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0