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

[tor/master] Add a missing include
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit 655adbf6677fde28ba37f029701083901eda7efd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 13:25:36 2014 -0500 Add a missing include --- src/or/status.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/status.c b/src/or/status.c index 4c42155..69f92ed 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -15,6 +15,7 @@ #include "circuitlist.h" #include "main.h" #include "hibernate.h" +#include "rephist.h" /** Return the total number of circuits. */ static int

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit 1b93e3c6d9802d64db7ce752717cf02ed35d1b60 Merge: 34740a1 655adbf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 13:27:04 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: changes/bug10485 src/or/rephist.c src/or/status.c changes/bug10485 | 8 ++++++++ src/or/rephist.c | 1 - src/or/status.c | 3 +-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --cc changes/bug10485 index aa599fb,7e5fa53..d2b3d8b --- a/changes/bug10485 +++ b/changes/bug10485 @@@ -1,4 -1,4 +1,12 @@@ ++<<<<<<< HEAD + o Minor bugfixes: + - Turn "circuit handshake stats since last time" log messages into a + heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc. + ++||||||| merged common ancestors ++======= + o Minor bugfixes: + - Move message about circuit handshake counts into the heartbeat + message where it belongs, instead of logging it once per hour + unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc. ++>>>>>>> origin/maint-0.2.4 diff --cc src/or/rephist.c index dd4ef12,2948bf8..66dc5f6 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@@ -3017,8 -3041,7 +3017,7 @@@ voi rep_hist_log_circuit_handshake_stats(time_t now) { (void)now; - /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */ - log_notice(LD_HIST, "Circuit handshake stats since last time: " + log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: " "%d/%d TAP, %d/%d NTor.", onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], diff --cc src/or/status.c index 415f4da,69f92ed..e1820c8 --- a/src/or/status.c +++ b/src/or/status.c @@@ -14,11 -14,8 +14,12 @@@ #include "router.h" #include "circuitlist.h" #include "main.h" +#include "rephist.h" #include "hibernate.h" + #include "rephist.h" +#include "statefile.h" + +static void log_accounting(const time_t now, const or_options_t *options); /** Return the total number of circuits. */ static int

1 0

[tor/maint-0.2.4] Add a missing include
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit 655adbf6677fde28ba37f029701083901eda7efd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 13:25:36 2014 -0500 Add a missing include --- src/or/status.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/status.c b/src/or/status.c index 4c42155..69f92ed 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -15,6 +15,7 @@ #include "circuitlist.h" #include "main.h" #include "hibernate.h" +#include "rephist.h" /** Return the total number of circuits. */ static int

1 0

[tor/maint-0.2.4] Deliver circuit handshake counts as part of the heartbeat
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit edc6fa25706534b35259111797fade88c9b694da Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 13:03:01 2014 -0500 Deliver circuit handshake counts as part of the heartbeat Previously, they went out once an hour, unconditionally. Fixes 10485; bugfix on 0.2.4.17-rc. --- changes/bug10485 | 4 ++++ src/or/main.c | 5 ----- src/or/rephist.c | 1 - src/or/status.c | 3 +++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug10485 b/changes/bug10485 new file mode 100644 index 0000000..7e5fa53 --- /dev/null +++ b/changes/bug10485 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Move message about circuit handshake counts into the heartbeat + message where it belongs, instead of logging it once per hour + unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc. diff --git a/src/or/main.c b/src/or/main.c index deed798..bd23141 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1353,11 +1353,6 @@ run_scheduled_events(time_t now) next_time_to_write_stats_files = next_write; } time_to_write_stats_files = next_time_to_write_stats_files; - - /* Also commandeer this opportunity to log how our circuit handshake - * stats have been doing. */ - if (public_server_mode(options)) - rep_hist_log_circuit_handshake_stats(now); } /* 1h. Check whether we should write bridge statistics to disk. diff --git a/src/or/rephist.c b/src/or/rephist.c index 131e531..2948bf8 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3041,7 +3041,6 @@ void rep_hist_log_circuit_handshake_stats(time_t now) { (void)now; - /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */ log_notice(LD_HIST, "Circuit handshake stats since last time: " "%d/%d TAP, %d/%d NTor.", onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], diff --git a/src/or/status.c b/src/or/status.c index d239e6e..4c42155 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -121,6 +121,9 @@ log_heartbeat(time_t now) log_notice(LD_HEARTBEAT, "TLS write overhead: %.f%%", overhead); } + if (public_server_mode(options)) + rep_hist_log_circuit_handshake_stats(now); + tor_free(uptime); tor_free(bw_sent); tor_free(bw_rcvd);

1 0

[tor/maint-0.2.4] Merge branch 'bug10485_024' into maint-0.2.4
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit 534acf400e017adf489dfe3eca87ad82bbc15167 Merge: 3511549 edc6fa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 13:24:12 2014 -0500 Merge branch 'bug10485_024' into maint-0.2.4 changes/bug10485 | 4 ++++ src/or/main.c | 5 ----- src/or/rephist.c | 1 - src/or/status.c | 3 +++ 4 files changed, 7 insertions(+), 6 deletions(-)

1 0

[tor/master] Rename sun to s_un in test_addr.c
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit 34740a17ea8145f7d308991b710e759b90a0d87b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 12:36:33 2014 -0500 Rename sun to s_un in test_addr.c Apparently the compiler on solaris 9 didn't like "sun" as an identifier. Fix for bug 10565; bugfix on 0.2.5.1-alpha. --- changes/bug10565 | 3 +++ src/test/test_addr.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/bug10565 b/changes/bug10565 new file mode 100644 index 0000000..9fef9d4 --- /dev/null +++ b/changes/bug10565 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix compilation on Solaris 9, which didn't like us to have an + identifier namd "sun". Fixes bug 10565; bugfix in 0.2.5.1-alpha. diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 4bc602d..79ddd95 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -899,7 +899,7 @@ test_addr_sockaddr_to_str(void *arg) struct sockaddr_in6 sin6; struct sockaddr_storage ss; #ifdef HAVE_SYS_UN_H - struct sockaddr_un sun; + struct sockaddr_un s_un; #endif #define CHECK(sa, s) do { \ v = tor_sockaddr_to_str((const struct sockaddr*) &(sa)); \ @@ -919,10 +919,10 @@ test_addr_sockaddr_to_str(void *arg) CHECK(sin, "127.128.128.1:1234"); #ifdef HAVE_SYS_UN_H - memset(&sun,0,sizeof(sun)); - sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, "/here/is/a/path", sizeof(sun.sun_path)); - CHECK(sun, "unix:/here/is/a/path"); + memset(&s_un,0,sizeof(s_un)); + s_un.sun_family = AF_UNIX; + strlcpy(s_un.sun_path, "/here/is/a/path", sizeof(s_un.sun_path)); + CHECK(s_un, "unix:/here/is/a/path"); #endif memset(&sin6,0,sizeof(sin6));

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 06 Feb '14

06 Feb '14

commit d9c111d954c6b3b7cd4704b4bec8d830ffa056f6 Merge: 3cb5c70 3511549 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 6 12:28:49 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10470 | 4 ++++ doc/tor.1.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.4] Clarify DirPort multiplicity
by arma＠torproject.org 06 Feb '14

06 Feb '14

commit 35115496511f64c08849a039c926910739467169 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 23 19:00:46 2013 -0500 Clarify DirPort multiplicity Fix for #10470 as suggested by arma --- changes/bug10470 | 4 ++++ doc/tor.1.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug10470 b/changes/bug10470 new file mode 100644 index 0000000..2b75343 --- /dev/null +++ b/changes/bug10470 @@ -0,0 +1,4 @@ + o Documentation fixes: + - Note that all but one DirPort entry must have the NoAdvertise flag + set. Fix for #10470. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 938ed2c..3f8f6da 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1763,7 +1763,8 @@ if DirPort is non-zero): [[DirPort]] **DirPort** \['address':]__PORT__|**auto** [_flags_]:: If this option is nonzero, advertise the directory service on this port. Set it to "auto" to have Tor pick a port for you. This option can occur - more than once. (Default: 0) + more than once, but only one advertised DirPort is supported: all + but one DirPort must have the **NoAdvertise** flag set. (Default: 0) + The same flags are supported here as are supported by ORPort.

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Feb '14

06 Feb '14

commit 0a44a24678023f928ee9dae4fa6fbe7e29ff9da7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 17:15:40 2014 +0000 Update translations for tails-misc --- nb.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nb.po b/nb.po index cef0f51..a5fefa5 100644 --- a/nb.po +++ b/nb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 15:05+0100\n" -"PO-Revision-Date: 2014-02-06 16:45+0000\n" +"PO-Revision-Date: 2014-02-06 16:50+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 msgid "Tor is ready" -msgstr "" +msgstr "Tor er klar" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 msgid "You can now access the Internet." @@ -81,19 +81,19 @@ msgstr "Utklippstavlen inneholder ikke gyldige inndata." #: config/chroot_local-includes/usr/local/bin/gpgApplet:296 #: config/chroot_local-includes/usr/local/bin/gpgApplet:298 msgid "Unknown Trust" -msgstr "" +msgstr "Ukjent tillit" #: config/chroot_local-includes/usr/local/bin/gpgApplet:300 msgid "Marginal Trust" -msgstr "" +msgstr "Marginal tillit" #: config/chroot_local-includes/usr/local/bin/gpgApplet:302 msgid "Full Trust" -msgstr "" +msgstr "Full tillit" #: config/chroot_local-includes/usr/local/bin/gpgApplet:304 msgid "Ultimate Trust" -msgstr "" +msgstr "Total tillit" #: config/chroot_local-includes/usr/local/bin/gpgApplet:357 msgid "Name" @@ -101,7 +101,7 @@ msgstr "Navn" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "Nøkkel-ID" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" @@ -137,7 +137,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:" -msgstr "" +msgstr "Signer meldingen som:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid "Choose keys" @@ -200,7 +200,7 @@ msgstr "Andre meldinger gitt av GnuPG:" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" -msgstr "" +msgstr "Tor er ikke klar" #: config/chroot_local-includes/usr/local/bin/iceweasel:13 msgid "Tor is not ready. Start Tor Browser anyway?" @@ -208,7 +208,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/iceweasel:14 msgid "Start Tor Browser" -msgstr "" +msgstr "Start Tor Browser" #: config/chroot_local-includes/usr/local/bin/iceweasel:15 msgid "Cancel" @@ -233,7 +233,7 @@ msgstr "Ikke tilgjengelig" #: config/chroot_local-includes/usr/local/bin/tails-about:16 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "" +msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:17 msgid "The Amnesic Incognito Live System" @@ -248,7 +248,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-about:20 msgid "About Tails" -msgstr "" +msgstr "Om Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 @@ -288,7 +288,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." -msgstr "" +msgstr "Starter I2P..." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 msgid "The I2P router console will be opened on start." @@ -326,7 +326,7 @@ msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" " more...</a>" -msgstr "" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Lær mer...</a>" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 06 Feb '14

06 Feb '14

commit e4448590066c271872a42d19747a41a9c8e06eea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 17:15:20 2014 +0000 Update translations for liveusb-creator --- nb/nb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/nb.po b/nb/nb.po index 35c3527..6ed3b20 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-29 14:16+0100\n" -"PO-Revision-Date: 2014-02-06 16:43+0000\n" +"PO-Revision-Date: 2014-02-06 16:50+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0