- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'sebastian/bug18242'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 69c47ab5fd608ecd47ddd3c1d2f041a2b41791b5 Merge: 4dc8dc4 55d6fd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:38:52 2016 -0500 Merge remote-tracking branch 'sebastian/bug18242' Makefile.am | 4 ++++ changes/bug18242 | 6 ++++++ configure.ac | 8 ++++++++ src/common/util.h | 7 ++++--- src/test/test_rendcache.c | 4 ++-- 5 files changed, 24 insertions(+), 5 deletions(-)

1 0

[tor/master] Remove support for unsigned time_t
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 5f7df92571ec5a2d1eddb257e22f5489acc4fc83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 29 09:18:59 2016 -0500 Remove support for unsigned time_t We've never actually tested this support, and we should probably assume it's broken. To the best of my knowledge, only OpenVMS has this, and even on OpenVMS it's a compile-time option to disable it. And I don't think we build on openvms anyway. (Everybody else seems to be working around the 2038 problem by using a 64-bit time_t, which won't expire for roughly 292 billion years.) Closes ticket 18184. --- changes/bug18184 | 5 +++++ configure.ac | 4 ++-- src/common/torint.h | 28 ++-------------------------- src/test/test_dir.c | 2 -- src/win32/orconfig.h | 3 --- 5 files changed, 9 insertions(+), 33 deletions(-) diff --git a/changes/bug18184 b/changes/bug18184 new file mode 100644 index 0000000..af493df --- /dev/null +++ b/changes/bug18184 @@ -0,0 +1,5 @@ + o Removed platform support: + - Tor no longer attempts to support platforms where the "time_t" type + is unsigned. (To the best of our knowledge, only OpenVMS does this, + and Tor has never actually built on OpenVMS.) Closes ticket 18184. + diff --git a/configure.ac b/configure.ac index 6d2312d..de7221d 100644 --- a/configure.ac +++ b/configure.ac @@ -1176,7 +1176,7 @@ AC_CHECK_TYPES([rlim_t], , , ]) AX_CHECK_SIGN([time_t], - [ AC_DEFINE(TIME_T_IS_SIGNED, 1, [Define if time_t is signed]) ], + [ : ], [ : ], [ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -1190,7 +1190,7 @@ AX_CHECK_SIGN([time_t], ]) if test "$ax_cv_decl_time_t_signed" = no; then - AC_MSG_WARN([You have an unsigned time_t; some things will probably break. Please tell the Tor developers about your interesting platform.]) + AC_MSG_ERROR([You have an unsigned time_t; Tor does not support that. Please tell the Tor developers about your interesting platform.]) fi AX_CHECK_SIGN([size_t], diff --git a/src/common/torint.h b/src/common/torint.h index 418fe0f..480ba1a 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -312,8 +312,6 @@ typedef uint32_t uintptr_t; #ifndef TIME_MAX -#ifdef TIME_T_IS_SIGNED - #if (SIZEOF_TIME_T == SIZEOF_INT) #define TIME_MAX ((time_t)INT_MAX) #elif (SIZEOF_TIME_T == SIZEOF_LONG) @@ -321,25 +319,13 @@ typedef uint32_t uintptr_t; #elif (SIZEOF_TIME_T == 8) #define TIME_MAX ((time_t)INT64_MAX) #else -#error "Can't define (signed) TIME_MAX" +#error "Can't define TIME_MAX" #endif -#else -/* Unsigned case */ -#if (SIZEOF_TIME_T == 4) -#define TIME_MAX ((time_t)UINT32_MAX) -#elif (SIZEOF_TIME_T == 8) -#define TIME_MAX ((time_t)UINT64_MAX) -#else -#error "Can't define (unsigned) TIME_MAX" -#endif -#endif /* time_t_is_signed */ #endif /* ifndef(TIME_MAX) */ #ifndef TIME_MIN -#ifdef TIME_T_IS_SIGNED - #if (SIZEOF_TIME_T == SIZEOF_INT) #define TIME_MIN ((time_t)INT_MIN) #elif (SIZEOF_TIME_T == SIZEOF_LONG) @@ -347,19 +333,9 @@ typedef uint32_t uintptr_t; #elif (SIZEOF_TIME_T == 8) #define TIME_MIN ((time_t)INT64_MIN) #else -#error "Can't define (signed) TIME_MIN" +#error "Can't define TIME_MIN" #endif -#else -/* Unsigned case */ -#if (SIZEOF_TIME_T == 4) -#define TIME_MIN ((time_t)UINT32_MIN) -#elif (SIZEOF_TIME_T == 8) -#define TIME_MIN ((time_t)UINT64_MIN) -#else -#error "Can't define (unsigned) TIME_MIN" -#endif -#endif /* time_t_is_signed */ #endif /* ifndef(TIME_MIN) */ #ifndef SIZE_MAX diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4824a94..83a8b8c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3312,7 +3312,6 @@ test_dir_download_status_schedule(void *arg) tt_assert(increment == expected_increment); tt_assert(dls_failure.next_attempt_at == TIME_MIN + expected_increment); -#if TIME_T_IS_SIGNED delay1 = INT_MAX; increment = download_status_schedule_get_delay(&dls_failure, schedule, @@ -3320,7 +3319,6 @@ test_dir_download_status_schedule(void *arg) expected_increment = delay1; tt_assert(increment == expected_increment); tt_assert(dls_failure.next_attempt_at == TIME_MAX); -#endif delay1 = 0; increment = download_status_schedule_get_delay(&dls_attempt, diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c0b14e5..f381152 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -220,9 +220,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS -/* Define to 1 if time_t is signed. */ -#define TIME_T_IS_SIGNED - /* Define to 1 iff unaligned int access is allowed */ #define UNALIGNED_INT_ACCESS_OK

1 0

[tor/master] Merge remote-tracking branch 'public/bug18184'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 4dc8dc4b89259e1418cd984abe1cd8d8fc6a7496 Merge: 2123f0a 5f7df92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:36:48 2016 -0500 Merge remote-tracking branch 'public/bug18184' changes/bug18184 | 5 +++++ configure.ac | 4 ++-- src/common/torint.h | 28 ++-------------------------- src/test/test_dir.c | 2 -- src/win32/orconfig.h | 3 --- 5 files changed, 9 insertions(+), 33 deletions(-)

1 0

[tor/master] Make the callgraph module-aware
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 2123f0a2f932f991a5209358a3aae183700c71ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:08:50 2016 -0500 Make the callgraph module-aware --- scripts/maint/analyze_callgraph.py | 50 ++++++++++++++++++++++++++++++++++---- scripts/maint/display_callgraph.py | 2 ++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/scripts/maint/analyze_callgraph.py b/scripts/maint/analyze_callgraph.py index b284604..8ce5827 100755 --- a/scripts/maint/analyze_callgraph.py +++ b/scripts/maint/analyze_callgraph.py @@ -9,19 +9,28 @@ import os class Parser: def __init__(self): self.calls = {} + self.definedIn = {} def enter_func(self, name): - if self.infunc and not self.extern: + if self.infunc and not self.extern and self.calledfns: + if self.infunc in self.definedIn: + #print "{}: {} or {}?".format( + # self.infunc, self.definedIn[self.infunc], self.module) + self.definedIn[self.infunc] = 'nil' + else: + self.definedIn[self.infunc] = self.module self.calls.setdefault(self.infunc, set()).update( self.calledfns ) self.calledfns = set() self.infunc = name self.extern = False - def parse_callgraph_file(self, inp): + def parse_callgraph_file(self, inp, module): self.infunc = None self.extern = False self.calledfns = set() + self.module = module + for line in inp: m = re.match(r"Call graph node for function: '([^']+)'", line) if m: @@ -189,13 +198,27 @@ def connection_bottlenecks(callgraph): if __name__ == '__main__': p = Parser() for fname in sys.argv[1:]: + modname = re.sub(r'.*/', '', fname).replace('.callgraph', '.c') with open(fname, 'r') as f: - p.parse_callgraph_file(f) + p.parse_callgraph_file(f, modname) - sys.stdout.flush + sys.stdout.flush() print "Building callgraph" callgraph = p.extract_callgraph() + inModule = p.definedIn + + print "Deriving module callgraph" + modCallgraph = {} + for fn in callgraph: + fnMod = inModule[fn] + for called in callgraph[fn]: + try: + calledMod = inModule[called] + except KeyError: + continue + modCallgraph.setdefault(fnMod, set()).add(calledMod) + del modCallgraph['nil'] print "Finding strongly connected components" sccs = strongly_connected_components(callgraph) @@ -206,11 +229,28 @@ if __name__ == '__main__': print "Finding bottlenecks..." bottlenecks = connection_bottlenecks(callgraph) + print "Finding module SCCs" + modSCCS = strongly_connected_components(modCallgraph) + + print "Finding module TC" + modTC = transitive_closure(modCallgraph) + + print "Finding module bottlenecks" + modB = connection_bottlenecks(modCallgraph) + data = { 'callgraph' : callgraph, 'sccs' : sccs, 'closure' : closure, - 'bottlenecks' : bottlenecks } + 'bottlenecks' : bottlenecks, + 'modules' : p.definedIn, + 'modItems' : { + 'callgraph' : modCallgraph, + 'sccs' : modSCCS, + 'closure' : modTC, + 'bottlenecks' : modB, + } + } with open('callgraph.pkl', 'w') as f: cPickle.dump(data, f) diff --git a/scripts/maint/display_callgraph.py b/scripts/maint/display_callgraph.py index 211bfda..c9001c6 100755 --- a/scripts/maint/display_callgraph.py +++ b/scripts/maint/display_callgraph.py @@ -4,6 +4,8 @@ import cPickle data = cPickle.load(open("callgraph.pkl")) +# data = data['modItems'] + callgraph = data['callgraph'] closure = data['closure'] sccs = data['sccs']

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 632cb9e07e91293d4b6cc87cde9475d53225f4db Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 18:16:45 2016 +0000 Update translations for tor-messenger-prefsdtd --- eu/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/prefs.dtd b/eu/prefs.dtd index 1441b0e..f2153e7 100644 --- a/eu/prefs.dtd +++ b/eu/prefs.dtd @@ -1,4 +1,4 @@ -<!ENTITY prefs.otrPreferences "OTR Preferences"> +<!ENTITY prefs.otrPreferences "OTR-hobespenak"> <!ENTITY prefs.otrSettings "OTR Settings"> <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys">

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 2c98b7c7aaeb3cda3f5724f2cc6fe75c8389b325 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 18:16:30 2016 +0000 Update translations for tor-messenger-fingerdtd --- eu/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/finger.dtd b/eu/finger.dtd index 24fa335..c0472ca 100644 --- a/eu/finger.dtd +++ b/eu/finger.dtd @@ -5,6 +5,6 @@ <!ENTITY finger.fingerprint "Fingerprint"> <!ENTITY finger.account "Kontua"> <!ENTITY finger.protocol "Protokoloa"> -<!ENTITY finger.verify "Verify"> +<!ENTITY finger.verify "Egiaztatu"> <!ENTITY finger.remove "Remove"> <!ENTITY finger.intro "Manage the list of fingerprints you've seen."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 24ed2320b9e30adfa29be316ba76e0b240a8f1a4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 18:16:12 2016 +0000 Update translations for tor-messenger-authdtd --- eu/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu/auth.dtd b/eu/auth.dtd index 02c4392..39cb82a 100644 --- a/eu/auth.dtd +++ b/eu/auth.dtd @@ -1,5 +1,5 @@ <!ENTITY authDialog.title "Verify contact's identity"> -<!ENTITY authDialog.authenticate "Verify"> +<!ENTITY authDialog.authenticate "Egiaztatu"> <!ENTITY authDialog.cancel "Cancel"> <!ENTITY authDialog.help "Laguntza"> <!ENTITY authDialog.yes "Bai">

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 540495172148c2147f550f5fb89014e19dc02488 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:18:00 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- nn/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/abouttbupdate.dtd b/nn/abouttbupdate.dtd index a1a0804..5c75143 100644 --- a/nn/abouttbupdate.dtd +++ b/nn/abouttbupdate.dtd @@ -3,4 +3,4 @@ <!ENTITY aboutTBUpdate.linkPrefix "For oppdatert informasjon om denne versjonen,"> <!ENTITY aboutTBUpdate.linkLabel "besøk nettsida vår"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Endringslogg:">

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit ebea09031b88687f5300fda4665ccd9e7ccd27f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:17:54 2016 +0000 Update translations for tails-openpgp-applet --- nn/openpgp-applet.pot | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nn/openpgp-applet.pot b/nn/openpgp-applet.pot index f5d76f6..ff6bfab 100644 --- a/nn/openpgp-applet.pot +++ b/nn/openpgp-applet.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2015-11-23 02:23+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2016-02-10 16:10+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: bin/openpgp-applet:163 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "" +msgstr "You are about to exit OpenPGP Applet. Are you sure?" #: bin/openpgp-applet:175 msgid "OpenPGP encryption applet" @@ -92,8 +93,8 @@ msgstr "Fingeravrykk:" #: bin/openpgp-applet:447 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Brukar-ID" +msgstr[1] "Brukar-ID-ar" #: bin/openpgp-applet:476 msgid "None (Don't sign)"

1 0

[translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit f46939d25cbda6e56fe0af2e3346220ef91e43b6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 10 16:17:46 2016 +0000 Update translations for tor-messenger-privdtd_completed --- nn/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nn/priv.dtd b/nn/priv.dtd new file mode 100644 index 0000000..6a58b23 --- /dev/null +++ b/nn/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Genererer privat nykel"> +<!ENTITY privDialog.done "Ferdig"> \ No newline at end of file

1 0