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

[tor/master] Add optional target directory parameter to coverage script and add reset-gcov target to Makefile.am
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit d1059a936644f1a3c274f97218c7224622f212df Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Jul 15 22:33:39 2013 -0700 Add optional target directory parameter to coverage script and add reset-gcov target to Makefile.am --- Makefile.am | 3 +++ changes/bug9267 | 4 ++++ contrib/coverage | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index 1bc1077..0361d87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,6 +71,9 @@ test: all test-network: all ./src/test/test-network.sh +reset-gcov: + rm -f src/*/*.gcda + # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, # eventdns.[hc], tinytest*.[ch] check-spaces: diff --git a/changes/bug9267 b/changes/bug9267 new file mode 100644 index 0000000..95a6211 --- /dev/null +++ b/changes/bug9267 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Added optional parameter to contrib/coverage script to specify directory + to put gcov files in, and added reset-gcov target to top-level makefile. + Fixes bug #9267. diff --git a/contrib/coverage b/contrib/coverage index f51649a..8d97166 100755 --- a/contrib/coverage +++ b/contrib/coverage @@ -5,9 +5,16 @@ # coverage -- run gcov on the appropriate set of object files to extract # coverage information. +dst=$1 + for fn in src/or/*.c src/common/*.c; do BN=`basename $fn` DN=`dirname $fn` F=`echo $BN | sed -e 's/\.c$//;'` + GC="${BN}.gcov" gcov -o $DN/src_*$F.o $fn + if [ -n $dst ] + then + mv $GC $dst/$GC + fi done

1 0

[tor/master] Eliminate an impossible case in replaycache_scrub_if_needed_internal()
by nickm＠torproject.org 16 Jul '13

16 Jul '13

commit 9b3a166b44267fb93ab4f2f406bfd1a308118ea6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Jul 16 06:01:50 2013 -0700 Eliminate an impossible case in replaycache_scrub_if_needed_internal() --- src/or/replaycache.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/or/replaycache.c b/src/or/replaycache.c index f136072..122efb7 100644 --- a/src/or/replaycache.c +++ b/src/or/replaycache.c @@ -134,7 +134,6 @@ replaycache_scrub_if_needed_internal(time_t present, replaycache_t *r) const char *digest; void *valp; time_t *access_time; - char scrub_this; /* sanity check */ if (!r || !(r->digests_seen)) { @@ -152,20 +151,10 @@ replaycache_scrub_if_needed_internal(time_t present, replaycache_t *r) /* okay, scrub time */ itr = digestmap_iter_init(r->digests_seen); while (!digestmap_iter_done(itr)) { - scrub_this = 0; digestmap_iter_get(itr, &digest, &valp); access_time = (time_t *)valp; - if (access_time) { - /* aged out yet? */ - if (*access_time < present - r->horizon) scrub_this = 1; - } else { - /* Buh? Get rid of it, anyway */ - log_info(LD_BUG, "replaycache_scrub_if_needed_internal() saw a NULL" - " entry in the digestmap."); - scrub_this = 1; - } - - if (scrub_this) { + /* aged out yet? */ + if (*access_time < present - r->horizon) { /* Advance the iterator and remove this one */ itr = digestmap_iter_next_rmv(r->digests_seen, itr); /* Free the value removed */

1 0

[onionoo/master] Avoid null pointer exceptions in servlet.
by karsten＠torproject.org 16 Jul '13

16 Jul '13

commit 7df20e7b92bc5c842931ff70c5ac2fa566612097 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 16 11:23:20 2013 +0200 Avoid null pointer exceptions in servlet. "Things you find in server logs when you're looking for something entirely unrelated." --- src/org/torproject/onionoo/ResourceServlet.java | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 996b870..110b123 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -944,11 +944,10 @@ public class ResourceServlet extends HttpServlet { fingerprint = fingerprint.substring(0, 40); DetailsDocument detailsDocument = this.documentStore.retrieve( DetailsDocument.class, false, fingerprint); - String documentString = detailsDocument.documentString; - StringBuilder sb = new StringBuilder(); - String detailsLines = null; - if (documentString != null) { - Scanner s = new Scanner(documentString); + if (detailsDocument != null && + detailsDocument.documentString != null) { + StringBuilder sb = new StringBuilder(); + Scanner s = new Scanner(detailsDocument.documentString); sb.append("{"); if (s.hasNextLine()) { /* Skip version line. */ @@ -964,13 +963,11 @@ public class ResourceServlet extends HttpServlet { } } s.close(); - detailsLines = sb.toString(); + String detailsLines = sb.toString(); if (detailsLines.length() > 1) { detailsLines = detailsLines.substring(0, detailsLines.length() - 1); } - } - if (detailsLines != null) { return detailsLines; } else { // TODO We should probably log that we didn't find a details @@ -993,8 +990,9 @@ public class ResourceServlet extends HttpServlet { fingerprint = fingerprint.substring(0, 40); BandwidthDocument bandwidthDocument = this.documentStore.retrieve( BandwidthDocument.class, false, fingerprint); - String bandwidthLines = bandwidthDocument.documentString; - if (bandwidthLines != null) { + if (bandwidthDocument != null && + bandwidthDocument.documentString != null) { + String bandwidthLines = bandwidthDocument.documentString; bandwidthLines = bandwidthLines.substring(0, bandwidthLines.length() - 1); return bandwidthLines; @@ -1016,8 +1014,9 @@ public class ResourceServlet extends HttpServlet { fingerprint = fingerprint.substring(0, 40); WeightsDocument weightsDocument = this.documentStore.retrieve( WeightsDocument.class, false, fingerprint); - String weightsLines = weightsDocument.documentString; - if (weightsLines != null) { + if (weightsDocument != null && + weightsDocument.documentString != null) { + String weightsLines = weightsDocument.documentString; weightsLines = weightsLines.substring(0, weightsLines.length() - 1); return weightsLines; } else {

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit 74ff5431b871c6c248ef7d138a40e5747f757c8a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:45:29 2013 +0000 Update translations for vidalia_alpha --- kn/vidalia_kn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn/vidalia_kn.po b/kn/vidalia_kn.po index 6f090a6..3df36cf 100644 --- a/kn/vidalia_kn.po +++ b/kn/vidalia_kn.po @@ -5,7 +5,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-07-16 08:10+0000\n" +"PO-Revision-Date: 2013-07-16 08:20+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit 6eae81647220130d5d893df3fa59aba239584918 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:45:21 2013 +0000 Update translations for vidalia --- kn/vidalia_kn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn/vidalia_kn.po b/kn/vidalia_kn.po index f8e3ffd..1347a4d 100644 --- a/kn/vidalia_kn.po +++ b/kn/vidalia_kn.po @@ -5,7 +5,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-07-16 08:10+0000\n" +"PO-Revision-Date: 2013-07-16 08:20+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit e031d5a8693c0738c34d8ad90e2e9b6aa0971d3b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:16:51 2013 +0000 Update translations for tor-launcher-progress_completed --- kn/progress.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kn/progress.dtd b/kn/progress.dtd new file mode 100644 index 0000000..39c1bbb --- /dev/null +++ b/kn/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "ಟಾರ್‌ನ ಸ್ಥಿತಿ"> +<!ENTITY torprogress.openSettings "ಅಪೂರ್ಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"> +<!ENTITY torprogress.heading "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ."> +<!ENTITY torprogress.pleaseWait "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೊಂಡ ನಂತರ ಟಾರ್ ಬ್ರೌಸರ್ ತೆರಕೊಳ್ಳುತ್ತೆ.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit ff1b0135a7ef91d5064f4e044bac8626e5b26d2a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:16:48 2013 +0000 Update translations for tor-launcher-progress --- kn/progress.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kn/progress.dtd b/kn/progress.dtd index e0dcfcc..39c1bbb 100644 --- a/kn/progress.dtd +++ b/kn/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title ""> -<!ENTITY torprogress.openSettings ""> -<!ENTITY torprogress.heading ""> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.dialog.title "ಟಾರ್‌ನ ಸ್ಥಿತಿ"> +<!ENTITY torprogress.openSettings "ಅಪೂರ್ಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"> +<!ENTITY torprogress.heading "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ."> +<!ENTITY torprogress.pleaseWait "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೊಂಡ ನಂತರ ಟಾರ್ ಬ್ರೌಸರ್ ತೆರಕೊಳ್ಳುತ್ತೆ.">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit f7c15e86b6adf8f7fce4431fa6cfc1e645315706 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:16:33 2013 +0000 Update translations for tails-greeter --- kn/kn.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kn/kn.po b/kn/kn.po index e827e29..7d10373 100644 --- a/kn/kn.po +++ b/kn/kn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-07-16 07:45+0000\n" +"PO-Revision-Date: 2013-07-16 08:10+0000\n" "Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 msgid "Forward" -msgstr "" +msgstr "ಮುಂದೆ" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" @@ -52,7 +52,7 @@ msgstr "ಓದೋದಕ್ಕೆ ಮಾತ್ರ?" #: ../glade/persistencewindow.glade.h:9 msgid "<i>Wrong passphrase. Please try again.</i>" -msgstr "" +msgstr "<i>ತಪ್ಪು ಗುಪ್ತಪದ. ಇನ್ನೊಂದ್ ಸಲ ಟ್ರೈ ಮಾಡಿ.</i>" #: ../glade/persistencewindow.glade.h:10 msgid "More options?" @@ -92,7 +92,7 @@ msgstr "ಈ ಆಯ್ಕೆ ಟೇಲ್ಸ್‌ ಮೈಕ್ರೋಸಾಫ಼ #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "" +msgstr "ವಿಂಡೋಸ್ ಎಕ್ಸ್. ಪಿಯ ಮಾಯಾಜಾಲವನ್ನು ಒಪ್ಪವಾಗಿಸು" #: ../glade/langpanel.glade.h:1 msgid " " @@ -108,14 +108,14 @@ msgstr "ಪ್ರಾದೇಶಿಕತೆ" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "ರೂಪ" #: ../GdmGreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "ಲೈವ್-ಪರ್ಸಿಸ್ಟ್ (ಮಾಹಿತಿಯನ್ನ ದೀರ್ಘಕಾಲ ಕಾಪಾಡೋದು) ಈ ರಿಟರ್ನ್ ಕೋಡ್ (ಫಲಿತಾಂಶ) ನೀಡಿ ಫ಼ೇಲಾಯ್ತು, %(returncode)s:⏎\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -123,7 +123,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "ಕ್ರಿಪ್ಟ್-ಸೆಟಪ್ ಅಥವಾ ರಹಸ್ಯವಾಗಿರಿಸೋ ವ್ಯವಸ್ಥೆ ಈ ರಿಟರ್ನ್ ಕೋಡ್ ಅಂದ್ರೆ ಫಲಿತಾಂಶ ನೀಡಿ ಫ಼ೇಲಾಯ್ತು, %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format @@ -131,9 +131,9 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "ಲೈವ್-ಪರ್ಸಿಸ್ಟ್ (ಮಾಹಿತಿಯನ್ನ ದೀರ್ಘಕಾಲ ಕಾಪಾಡೋದು) ಈ ರಿಟರ್ನ್ ಕೋಡ್ (ಫಲಿತಾಂಶ) ನೀಡಿ ಫ಼ೇಲಾಯ್ತು,%(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "ಬೇರೆ..."

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit 391dfe696f5aef560f9664b9fa05d8e05670da5d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:15:28 2013 +0000 Update translations for vidalia_alpha --- kn/vidalia_kn.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kn/vidalia_kn.po b/kn/vidalia_kn.po index f7596cc..6f090a6 100644 --- a/kn/vidalia_kn.po +++ b/kn/vidalia_kn.po @@ -5,7 +5,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-07-15 07:30+0000\n" +"PO-Revision-Date: 2013-07-16 08:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -1480,7 +1480,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "ಮುಂದೆ" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)" @@ -1733,7 +1733,7 @@ msgstr "" msgctxt "MainWindow" msgid "Connecting to the Tor network" -msgstr "" +msgstr "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ." msgctxt "MainWindow" msgid "Establishing a Tor circuit" @@ -3516,7 +3516,7 @@ msgstr "" msgctxt "StatusTab" msgid "Tor Status" -msgstr "" +msgstr "ಟಾರ್‌ನ ಸ್ಥಿತಿ" msgctxt "StatusTab" msgid "Show on startup"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 Jul '13

16 Jul '13

commit 3754de5bb71c1a2809332b59e38761e12bd24a63 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 16 08:15:22 2013 +0000 Update translations for vidalia --- kn/qt_kn.po | 4 ++-- kn/vidalia_kn.po | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kn/qt_kn.po b/kn/qt_kn.po index d8e3623..61291e0 100644 --- a/kn/qt_kn.po +++ b/kn/qt_kn.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-18 22:31+0000\n" +"PO-Revision-Date: 2013-07-16 08:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -324,7 +324,7 @@ msgstr "" #: ui_qfiledialog.h:269 msgctxt "QFileDialog" msgid "Forward" -msgstr "" +msgstr "ಮುಂದೆ" #: qfiledialog.cpp:2137 msgctxt "QFileDialog" diff --git a/kn/vidalia_kn.po b/kn/vidalia_kn.po index 0bdf2e0..f8e3ffd 100644 --- a/kn/vidalia_kn.po +++ b/kn/vidalia_kn.po @@ -5,7 +5,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-07-15 07:30+0000\n" +"PO-Revision-Date: 2013-07-16 08:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -1448,7 +1448,7 @@ msgstr "" msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "ಮುಂದೆ" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)" @@ -1761,7 +1761,7 @@ msgstr "" msgctxt "MainWindow" msgid "Connecting to the Tor network" -msgstr "" +msgstr "ಟಾರ್ ಜಾಲಕ್ಕೆ ಸೇರಿಕೋತಾ ಇದೀವಿ." msgctxt "MainWindow" msgid "Establishing a Tor circuit" @@ -2397,7 +2397,7 @@ msgstr "" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "ಟಾರ್‌ನ ಸ್ಥಿತಿ" msgctxt "MessageLog" msgid "Advanced"

1 0