September 2018 - tor-commits - lists.torproject.org

[tor/master] But, actually move systemd_watchdog_timer free into mainloop.c
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 7d9bea6a773cc18c4790883cb18e3e61131a4ab1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 16:49:20 2018 -0400 But, actually move systemd_watchdog_timer free into mainloop.c --- src/core/mainloop/mainloop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 4ab00f92d..306c78735 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2897,6 +2897,10 @@ tor_mainloop_free_all(void) mainloop_event_free(postloop_cleanup_ev); mainloop_event_free(handle_deferred_signewnym_ev); +#ifdef HAVE_SYSTEMD_209 + periodic_timer_free(systemd_watchdog_timer); +#endif + stats_n_bytes_read = stats_n_bytes_written = 0; memset(&global_bucket, 0, sizeof(global_bucket));

1 0

[tor/master] Move systemd_watchdog_timer free into mainloop.c
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 7eea45c5c460f735594ed9a208d2fe3e3714a368 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 16:46:17 2018 -0400 Move systemd_watchdog_timer free into mainloop.c --- src/app/main/main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index ab6610511..eeb219f3d 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -803,10 +803,6 @@ tor_free_all(int postfork) tor_mainloop_free_all(); -#ifdef HAVE_SYSTEMD_209 - periodic_timer_free(systemd_watchdog_timer); -#endif - if (!postfork) { release_lockfile(); }

1 0

[tor/master] Missing include in ntmain.c
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 08d934b3fecc187e91b2e23347250787d5371cef Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 16:32:14 2018 -0400 Missing include in ntmain.c --- src/app/main/ntmain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index eab6d23b5..800720a0b 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -20,12 +20,14 @@ #ifdef _WIN32 #include "core/or/or.h" + #include "app/config/config.h" #include "app/main/main.h" #include "app/main/ntmain.h" -#include "lib/log/win32err.h" -#include "lib/fs/winlib.h" +#include "core/mainloop/mainloop.h" #include "lib/evloop/compat_libevent.h" +#include "lib/fs/winlib.h" +#include "lib/log/win32err.h" #include <windows.h> #define GENSRV_SERVICENAME "tor"

1 0

[tor/master] move protover_rust.c to core/or/
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 5c0dd1aa908f891c8ad453bdcd70a4f6c51ae4b3 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 21 20:14:53 2018 +0000 move protover_rust.c to core/or/ Missed in 667a6e8fe9b8169e86f3ab889c4ea8af845d6939. --- changes/ticket27814 | 3 +++ src/core/include.am | 2 +- src/core/{proto => or}/protover_rust.c | 0 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket27814 b/changes/ticket27814 new file mode 100644 index 000000000..739754c61 --- /dev/null +++ b/changes/ticket27814 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move protover_rust.c to the same place protover.c was moved to. + Closes ticket 27814. diff --git a/src/core/include.am b/src/core/include.am index d042f697b..2fddffd47 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -38,6 +38,7 @@ LIBTOR_APP_A_SOURCES = \ src/core/or/onion.c \ src/core/or/policies.c \ src/core/or/protover.c \ + src/core/or/protover_rust.c \ src/core/or/reasons.c \ src/core/or/relay.c \ src/core/or/scheduler.c \ @@ -49,7 +50,6 @@ LIBTOR_APP_A_SOURCES = \ src/core/proto/proto_ext_or.c \ src/core/proto/proto_http.c \ src/core/proto/proto_socks.c \ - src/core/proto/protover_rust.c \ src/feature/api/tor_api.c \ src/feature/client/addressmap.c \ src/feature/client/bridges.c \ diff --git a/src/core/proto/protover_rust.c b/src/core/or/protover_rust.c similarity index 100% rename from src/core/proto/protover_rust.c rename to src/core/or/protover_rust.c

1 0

[tor/master] Merge remote-tracking branch 'onionk/protover-rust1'
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 169f238c238363ba0311aeea9ead4553846d6be3 Merge: 63e08f56b 5c0dd1aa9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 16:28:32 2018 -0400 Merge remote-tracking branch 'onionk/protover-rust1' changes/ticket27814 | 3 +++ src/core/include.am | 2 +- src/core/{proto => or}/protover_rust.c | 0 3 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/365'
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 63e08f56b889eb56ae555b5e8505187331017ff5 Merge: b7bd162af 53d8aa136 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 21 16:13:59 2018 -0400 Merge remote-tracking branch 'tor-github/pr/365' changes/bug27675 | 3 +++ src/test/test_rebind.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] Remove misleading first line in test_rebind.py
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 81199eaf0e7e78144617c277798bf0c944f7b2c7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Sep 14 19:47:02 2018 +0300 Remove misleading first line in test_rebind.py test_rebind.py actually does not require Python 3. Bugfix on 5a11670fcaad0a58de48425ba80510effbe35628; bug not in any Tor release. --- src/test/test_rebind.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index f02cb79b7..42a4658b4 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -1,5 +1,3 @@ -#!/usr/bin/python3 - from __future__ import print_function import sys

1 0

[tor/master] Add changes file
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit 53d8aa13682caccbad3fff094c78cc4229e8fe13 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Sep 21 10:57:10 2018 +0300 Add changes file --- changes/bug27675 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug27675 b/changes/bug27675 new file mode 100644 index 000000000..e4c3eb5a0 --- /dev/null +++ b/changes/bug27675 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - In test_rebind.py check if Python version is in supported + ranges. Fixes bug 27675; bugfix on 0.3.5.1-alpha.

1 0

[tor/master] Check Python version in test_rebind.py
by nickm＠torproject.org 21 Sep '18

21 Sep '18

commit d40b0e73c278cd54c6c4765f35b4d031a5882562 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Sep 14 20:13:23 2018 +0300 Check Python version in test_rebind.py --- src/test/test_rebind.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 42a4658b4..7ba3a5796 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -35,6 +35,12 @@ def pick_random_port(): return port +if sys.hexversion < 0x02070000: + sys.exit("ERROR: unsupported Python version (should be >= 2.7)") + +if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000: + sys.exit("ERROR: unsupported Python3 version (should be >= 3.1)") + control_port = pick_random_port() socks_port = pick_random_port()

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 21 Sep '18

21 Sep '18

commit 0432de864deb8cd286de4a0808c5e730d02510f6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 21 19:45:18 2018 +0000 Update translations for bridgedb_completed --- ko/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 498e8cd55..b751b9a9d 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ # cwt96 <cwt967(a)naver.com>, 2012 # 고영욱 <greenknite(a)naver.com>, 2015 # Hyuntae Chun, 2017 -# graphene <imsesaok(a)tuta.io>, 2018 +# Oliver Lee <imsesaok(a)tuta.io>, 2018 # Jamin <bakzaa(a)gmail.com>, 2014 # Dr.what <javrick6(a)naver.com>, 2014-2015 # Gu Hong Min <placidmoon1(a)gmail.com>, 2015 @@ -19,14 +19,14 @@ # Philipp Sauter <qt123(a)pm.me>, 2018 # Sam Ryoo <samryoo(a)gmail.com>, 2014 # Sangmin Lee <sangminlee7648(a)gmail.com>, 2016 -# revi <revi(a)pobox.com>, 2014 +# Revi_, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-09-19 09:49+0000\n" -"Last-Translator: graphene <imsesaok(a)tuta.io>\n" +"PO-Revision-Date: 2018-09-21 19:17+0000\n" +"Last-Translator: Philipp Sauter <qt123(a)pm.me>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "죄송합니다! 당신의 요청에 무언가 문제가 있습니다." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "버그 보고하기" +msgstr "버그를 보고하기" #: bridgedb/https/templates/base.html:82 msgid "Source Code"

1 0