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

[tor/master] test: Unit test for the HS service event rescan
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 8b58e1e323e362463906d2576b9d2b9e788c2f30 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 27 11:16:00 2018 -0400 test: Unit test for the HS service event rescan Because we rescan the main loop event list if the global map of services has changed, this makes sure it does work. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_periodic_event.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index 9f62cd680..74e799360 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -253,6 +253,62 @@ test_pe_get_roles(void *arg) hs_free_all(); } +static void +test_pe_hs_service(void *arg) +{ + hs_service_t service, *to_remove = NULL; + + (void) arg; + + hs_init(); + /* We need to put tor in hibernation live state so the events requiring + * network gets enabled. */ + consider_hibernation(time(NULL)); + /* Initialize the events so we can enable them */ + initialize_periodic_events(); + + /* Hack: We'll set a dumb fn() of each events so they don't get called when + * dispatching them. We just want to test the state of the callbacks, not + * the whole code path. */ + for (int i = 0; periodic_events[i].name; ++i) { + periodic_event_item_t *item = &periodic_events[i]; + item->fn = dumb_event_fn; + } + + /* This should trigger a rescan of the list and enable the HS service + * events. */ + register_dummy_hidden_service(&service); + /* Note down the reference because we need to remove this service from the + * global list before the hs_free_all() call so it doesn't try to free + * memory on the stack. Furthermore, we can't remove it now else it will + * trigger a rescan of the event disabling the HS service event. */ + to_remove = &service; + + for (int i = 0; periodic_events[i].name; ++i) { + periodic_event_item_t *item = &periodic_events[i]; + if (item->roles & PERIODIC_EVENT_ROLE_HS_SERVICE) { + tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); + } + } + to_remove = NULL; + + /* Remove the service from the global map, it should trigger a rescan and + * disable the HS service events. */ + remove_service(get_hs_service_map(), &service); + for (int i = 0; periodic_events[i].name; ++i) { + periodic_event_item_t *item = &periodic_events[i]; + if (item->roles & PERIODIC_EVENT_ROLE_HS_SERVICE) { + tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); + } + } + + done: + if (to_remove) { + remove_service(get_hs_service_map(), to_remove); + } + hs_free_all(); +} + #define PE_TEST(name) \ { #name, test_pe_## name , TT_FORK, NULL, NULL } @@ -260,6 +316,7 @@ struct testcase_t periodic_event_tests[] = { PE_TEST(initialize), PE_TEST(launch), PE_TEST(get_roles), + PE_TEST(hs_service), END_OF_TESTCASES };

1 0

[translation/support-tormessenger] Update translations for support-tormessenger
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 409c8d4166bb3e1d05f6a7680c657cc6895a1a9c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 15:50:46 2018 +0000 Update translations for support-tormessenger --- ja.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja.json b/ja.json index bbad42d5c..7e6d722fb 100644 --- a/ja.json +++ b/ja.json @@ -8,8 +8,8 @@ "messenger-2": { "id": "#messenger-2", "control": "messenger-2", - "title": "What platforms is Tor Messenger available on?", - "description": "Tor Messenger (beta) is currently available on Linux, Windows, and OSX." + "title": "Tor Messengerはどのプラットフォームに対応していますか？", + "description": "Tor Messenger (beta)は現在Linux,Windows,OSXに対応しています。" }, "messenger-3": { "id": "#messenger-3",

1 0

[translation/support-topics] Update translations for support-topics
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 3ff8fd45c3d28579d7339ad90f8c8929cf71f195 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 15:50:38 2018 +0000 Update translations for support-topics --- ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.json b/ja.json index 54f01c9c8..919fc6a31 100644 --- a/ja.json +++ b/ja.json @@ -27,7 +27,7 @@ "connecting": { "path": "#connectingtotor", "control": "connectingtotor", - "label": "Connecting To Tor" + "label": "Torに接続しています" }, "censorship": { "path": "#censorship",

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 558d66e0ac4e80f4db447b16fd83cdee17ed319a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 15:50:30 2018 +0000 Update translations for support-tbb --- ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.json b/ja.json index 556a31c5d..848488771 100644 --- a/ja.json +++ b/ja.json @@ -242,7 +242,7 @@ "tbb-40": { "id": "#tbb-40", "control": "tbb-40", - "title": "Does Tor Browser use a different circuit for each website?", + "title": "TorブラウザはそれぞれのWebサイトごとに異なるサーキットを使用しますか？", "description": "In Tor Browser, every domain gets its own circuit. <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…">The Design and Implementation of Tor Browser</a> document has further details regarding this issue." }, "tbb-41": {

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 12b20c58fa9f31054d2457e1d879bb91e7adc73e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 15:50:22 2018 +0000 Update translations for support-miscellaneous --- ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.json b/ja.json index d497cbdde..acaa7e58d 100644 --- a/ja.json +++ b/ja.json @@ -32,7 +32,7 @@ "misc-6": { "id": "#misc-6", "control": "misc-6", - "title": "Does Tor keep logs?", + "title": "Torはログを保持しますか？", "description": "Tor doesn't keep any logs that could identify a particular user. We do take some safe measurements of how the network functions, which you can check out at <a href=\"https://metrics.torproject.org/\">Tor Metrics</a>." }, "misc-7": {

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 3e6da7605de712106391d4fb5f5bffabd2ecaa32 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 15:49:40 2018 +0000 Update translations for tor-browser-manual --- ja/ja.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 1762d5868..4e9c7afc6 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -8,12 +8,13 @@ # Hussein Hassan <hehewawa1(a)gmail.com>, 2017 # daisuke osada (daiskeh) <dosada(a)gmail.com>, 2017 # Steve Dougherty, 2018 +# ishikawa satoru <qaz345(a)protonmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Steve Dougherty, 2018\n" +"Last-Translator: ishikawa satoru <qaz345(a)protonmail.com>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1005,7 +1006,7 @@ msgstr "" #: secure-connections.page:81 msgid "Username and password used for authentication." -msgstr "" +msgstr "認証のためのユーザ名とパスワード" #: secure-connections.page:92 msgid "Data being transmitted."

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 27 Apr '18

27 Apr '18

commit 0bc1a7f83aa7a2c9d2a34e4fb12246506d30177e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 27 15:49:24 2018 +0000 Update translations for tails-greeter-2 --- ja/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index ba8f8cf1e..6c66969fd 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: TEN CO <jpnanon0311(a)protonmail.com>, 2018\n" +"Last-Translator: ishikawa satoru <qaz345(a)protonmail.com>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,7 +145,7 @@ msgstr "" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "永続ストレージを解除するためのパスフレーズを入力してください" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528

1 0

[tor/master] hibernation: Rescan the event list on state change
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit d6903e9e87ffd39846b7cacebcfc8bae71f3ca5f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Apr 26 15:00:19 2018 -0400 hibernation: Rescan the event list on state change When we change the hibernation state, rescan the main loop event list because the new state might affect the events. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hibernate.c | 10 +++++++++- src/or/main.c | 3 +-- src/or/main.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 9fed33855..c4ae63acc 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -1111,10 +1111,18 @@ getinfo_helper_accounting(control_connection_t *conn, static void on_hibernate_state_change(hibernate_state_t prev_state) { - (void)prev_state; /* Should we do something with this? */ control_event_server_status(LOG_NOTICE, "HIBERNATION_STATUS STATUS=%s", hibernate_state_to_string(hibernate_state)); + + /* We are changing hibernation state, this can affect the main loop event + * list. Rescan it to update the events state. We do this whatever the new + * hibernation state because they can each possibly affect an event. The + * initial state means we are booting up so we shouldn't scan here because + * at this point the events in the list haven't been initialized. */ + if (prev_state != HIBERNATE_STATE_INITIAL) { + rescan_periodic_events(get_options()); + } } #ifdef TOR_UNIT_TESTS diff --git a/src/or/main.c b/src/or/main.c index c7bd720cc..b5a701713 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -150,7 +150,6 @@ static int run_main_loop_until_done(void); static void process_signal(int sig); static void shutdown_did_not_work_callback(evutil_socket_t fd, short event, void *arg) ATTR_NORETURN; -static void rescan_periodic_events(const or_options_t *options); /********* START VARIABLES **********/ @@ -1549,7 +1548,7 @@ teardown_periodic_events(void) /** Do a pass at all our periodic events, disable those we don't need anymore * and enable those we need now using the given options. */ -static void +void rescan_periodic_events(const or_options_t *options) { tor_assert(options); diff --git a/src/or/main.h b/src/or/main.h index 33ef40ce4..2447339fb 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -62,6 +62,7 @@ void reset_all_main_loop_timers(void); void reschedule_descriptor_update_check(void); void reschedule_directory_downloads(void); void mainloop_schedule_postloop_cleanup(void); +void rescan_periodic_events(const or_options_t *options); MOCK_DECL(long,get_uptime,(void)); MOCK_DECL(void,reset_uptime,(void));

1 0

[tor/master] main: Add mainloop callback event flags
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 05d314f888dd96840d92fbcc513974487485f4cb Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Apr 26 14:20:31 2018 -0400 main: Add mainloop callback event flags Implement the ability to set flags per events which influences the set up of the event. This commit only adds one flag which is "need network" meaning that the event is not enabled if tor has disabled the network or if hibernation mode. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25376_25762 | 10 ++++++ src/or/main.c | 75 ++++++++++++++++++++++++++---------------- src/or/periodic.h | 15 +++++++-- src/test/test_periodic_event.c | 4 +++ 4 files changed, 73 insertions(+), 31 deletions(-) diff --git a/changes/ticket25376_25762 b/changes/ticket25376_25762 new file mode 100644 index 000000000..b3ebf56d3 --- /dev/null +++ b/changes/ticket25376_25762 @@ -0,0 +1,10 @@ + o Major feature (main loop, CPU usage): + - Previously, tor would enable at startup all possible main loop event + regardless if it needed them. For instance, directory authorities + callbacks were fired up even for client only. We have now refactored this + whole interface to only enable the appropriate callbacks depending on what + are tor roles (client only, relay, hidden service, etc.). Furthermore, + these events now depend on DisableNetwork or the hibernation state in + order to enable them. This is a big step towards reducing client CPU usage + by reducing the amount of wake ups the daemon does. Closes ticket 25376 + and 25762. diff --git a/src/or/main.c b/src/or/main.c index a7896fafa..c7bd720cc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1362,54 +1362,65 @@ CALLBACK(write_stats_file); #undef CALLBACK /* Now we declare an array of periodic_event_item_t for each periodic event */ -#define CALLBACK(name, r) PERIODIC_EVENT(name, r) +#define CALLBACK(name, r, f) PERIODIC_EVENT(name, r, f) STATIC periodic_event_item_t periodic_events[] = { /* Everyone needs to run those. */ - CALLBACK(add_entropy, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(check_expired_networkstatus, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(clean_caches, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(fetch_networkstatus, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(heartbeat, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(launch_descriptor_fetches, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(reset_padding_counts, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(retry_listeners, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(rotate_x509_certificate, PERIODIC_EVENT_ROLE_ALL), - CALLBACK(write_stats_file, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(add_entropy, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(check_expired_networkstatus, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(clean_caches, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(fetch_networkstatus, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(heartbeat, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(launch_descriptor_fetches, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(reset_padding_counts, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(retry_listeners, PERIODIC_EVENT_ROLE_ALL, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(rotate_x509_certificate, PERIODIC_EVENT_ROLE_ALL, 0), + CALLBACK(write_stats_file, PERIODIC_EVENT_ROLE_ALL, 0), /* Routers (bridge and relay) only. */ - CALLBACK(check_descriptor, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(check_ed_keys, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(check_for_reachability_bw, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(check_onion_keys_expiry_time, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(expire_old_ciruits_serverside, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(retry_dns, PERIODIC_EVENT_ROLE_ROUTER), - CALLBACK(rotate_onion_key, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(check_descriptor, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_ed_keys, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(check_for_reachability_bw, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_onion_keys_expiry_time, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(expire_old_ciruits_serverside, PERIODIC_EVENT_ROLE_ROUTER, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(retry_dns, PERIODIC_EVENT_ROLE_ROUTER, 0), + CALLBACK(rotate_onion_key, PERIODIC_EVENT_ROLE_ROUTER, 0), /* Authorities (bridge and directory) only. */ - CALLBACK(downrate_stability, PERIODIC_EVENT_ROLE_AUTHORITIES), - CALLBACK(launch_reachability_tests, PERIODIC_EVENT_ROLE_AUTHORITIES), - CALLBACK(save_stability, PERIODIC_EVENT_ROLE_AUTHORITIES), + CALLBACK(downrate_stability, PERIODIC_EVENT_ROLE_AUTHORITIES, 0), + CALLBACK(launch_reachability_tests, PERIODIC_EVENT_ROLE_AUTHORITIES, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(save_stability, PERIODIC_EVENT_ROLE_AUTHORITIES, 0), /* Directory authority only. */ - CALLBACK(check_authority_cert, PERIODIC_EVENT_ROLE_DIRAUTH), + CALLBACK(check_authority_cert, PERIODIC_EVENT_ROLE_DIRAUTH, 0), /* Relay only. */ - CALLBACK(check_canonical_channels, PERIODIC_EVENT_ROLE_RELAY), - CALLBACK(check_dns_honesty, PERIODIC_EVENT_ROLE_RELAY), + CALLBACK(check_canonical_channels, PERIODIC_EVENT_ROLE_RELAY, + PERIODIC_EVENT_FLAG_NEED_NET), + CALLBACK(check_dns_honesty, PERIODIC_EVENT_ROLE_RELAY, + PERIODIC_EVENT_FLAG_NEED_NET), /* Hidden Service service only. */ - CALLBACK(hs_service, PERIODIC_EVENT_ROLE_HS_SERVICE), + CALLBACK(hs_service, PERIODIC_EVENT_ROLE_HS_SERVICE, + PERIODIC_EVENT_FLAG_NEED_NET), /* Bridge only. */ - CALLBACK(record_bridge_stats, PERIODIC_EVENT_ROLE_BRIDGE), + CALLBACK(record_bridge_stats, PERIODIC_EVENT_ROLE_BRIDGE, 0), /* Client only. */ - CALLBACK(rend_cache_failure_clean, PERIODIC_EVENT_ROLE_CLIENT), + CALLBACK(rend_cache_failure_clean, PERIODIC_EVENT_ROLE_CLIENT, 0), /* Bridge Authority only. */ - CALLBACK(write_bridge_ns, PERIODIC_EVENT_ROLE_BRIDGEAUTH), + CALLBACK(write_bridge_ns, PERIODIC_EVENT_ROLE_BRIDGEAUTH, 0), + END_OF_PERIODIC_EVENTS }; #undef CALLBACK @@ -1548,6 +1559,12 @@ rescan_periodic_events(const or_options_t *options) for (int i = 0; periodic_events[i].name; ++i) { periodic_event_item_t *item = &periodic_events[i]; + /* Handle the event flags. */ + if (net_is_disabled() && + (item->flags & PERIODIC_EVENT_FLAG_NEED_NET)) { + continue; + } + /* Enable the event if needed. It is safe to enable an event that was * already enabled. Same goes for disabling it. */ if (item->roles & roles) { diff --git a/src/or/periodic.h b/src/or/periodic.h index dde27db5a..a044b34fd 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -29,6 +29,15 @@ (PERIODIC_EVENT_ROLE_AUTHORITIES | PERIODIC_EVENT_ROLE_CLIENT | \ PERIODIC_EVENT_ROLE_HS_SERVICE | PERIODIC_EVENT_ROLE_ROUTER) +/* + * Event flags which can change the behavior of an event. + */ + +/* Indicate that the event needs the network meaning that if we are in + * DisableNetwork or hibernation mode, the event won't be enabled. This obey + * the net_is_disabled() check. */ +#define PERIODIC_EVENT_FLAG_NEED_NET (1U << 0) + /** Callback function for a periodic event to take action. The return value * influences the next time the function will get called. Return * PERIODIC_EVENT_NO_UPDATE to not update last_action_time and be polled @@ -49,13 +58,15 @@ typedef struct periodic_event_item_t { /* Bitmask of roles define above for which this event applies. */ uint32_t roles; + /* Bitmask of flags which can change the behavior of the event. */ + uint32_t flags; /* Indicate that this event has been enabled that is scheduled. */ unsigned int enabled : 1; } periodic_event_item_t; /** events will get their interval from first execution */ -#define PERIODIC_EVENT(fn, r) { fn##_callback, 0, NULL, #fn, r, 0 } -#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0, 0 } +#define PERIODIC_EVENT(fn, r, f) { fn##_callback, 0, NULL, #fn, r, f, 0 } +#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0, 0, 0 } /* Return true iff the given event was setup before thus is enabled to be * scheduled. */ diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index 1a9f4351e..bebbb5e58 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -16,6 +16,7 @@ #include "or.h" #include "config.h" +#include "hibernate.h" #include "hs_service.h" #include "main.h" #include "periodic.h" @@ -74,6 +75,9 @@ test_pe_launch(void *arg) (void) arg; hs_init(); + /* We need to put tor in hibernation live state so the events requiring + * network gets enabled. */ + consider_hibernation(time(NULL)); /* Hack: We'll set a dumb fn() of each events so they don't get called when * dispatching them. We just want to test the state of the callbacks, not

1 0

[tor/master] Merge branch 'ticket25376_034_031_squashed'
by nickm＠torproject.org 27 Apr '18

27 Apr '18

commit 3a47dfed349ee2c05f30ba142d3583772fa2287f Merge: cc74dc006 d6903e9e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 09:28:43 2018 -0400 Merge branch 'ticket25376_034_031_squashed' changes/ticket25376_25762 | 10 ++++++ src/or/hibernate.c | 10 +++++- src/or/main.c | 78 +++++++++++++++++++++++++----------------- src/or/main.h | 1 + src/or/periodic.h | 15 ++++++-- src/test/test_periodic_event.c | 4 +++ 6 files changed, 84 insertions(+), 34 deletions(-)

1 0