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

[tor/master] Merge branch 'ticket26063_squashed'
by nickm＠torproject.org 10 May '18

10 May '18

commit 1eede00a4bd9a7de2acf77393f2fc57aa3196d08 Merge: beca6a585 8b4cf7771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:13:28 2018 -0400 Merge branch 'ticket26063_squashed' changes/ticket26063 | 5 +++ src/common/compat_libevent.c | 31 ++++++++++++++- src/common/compat_libevent.h | 2 + src/or/config.c | 9 +++-- src/or/connection.c | 12 +++--- src/or/connection_edge.c | 1 + src/or/control.c | 89 ++++++++++++++++++++++++++++++++++++++++++-- src/or/control.h | 3 ++ src/or/dirserv.c | 2 +- src/or/hibernate.c | 17 ++++++++- src/or/hibernate.h | 1 + src/or/main.c | 67 +++++++++++++++++---------------- src/or/main.h | 1 + src/or/router.c | 18 +++++++-- src/or/router.h | 1 + 15 files changed, 208 insertions(+), 51 deletions(-) diff --cc src/or/hibernate.c index b83167d20,24479cff9..d7d259470 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@@ -1187,18 -1137,10 +1200,20 @@@ on_hibernate_state_change(hibernate_sta if (prev_state != HIBERNATE_STATE_INITIAL) { rescan_periodic_events(get_options()); } + + reschedule_per_second_timer(); } +/** Free all resources held by the accounting module */ +void +accounting_free_all(void) +{ + mainloop_event_free(wakeup_event); + hibernate_state = HIBERNATE_STATE_INITIAL; + hibernate_end_time = 0; + shutdown_time = 0; +} + #ifdef TOR_UNIT_TESTS /** * Manually change the hibernation state. Private; used only by the unit diff --cc src/or/main.c index 69e7f05b1,0493596aa..6cb9b6249 --- a/src/or/main.c +++ b/src/or/main.c @@@ -2495,70 -2491,40 +2491,100 @@@ hs_service_callback(time_t now, const o /** Timer: used to invoke second_elapsed_callback() once per second. */ static periodic_timer_t *second_timer = NULL; + + /** + * Enable or disable the per-second timer as appropriate, creating it if + * necessary. + */ + void + reschedule_per_second_timer(void) + { + struct timeval one_second; + one_second.tv_sec = 1; + one_second.tv_usec = 0; + + if (! second_timer) { + second_timer = periodic_timer_new(tor_libevent_get_base(), + &one_second, + second_elapsed_callback, + NULL); + tor_assert(second_timer); + } + + const bool run_per_second_events = + control_any_per_second_event_enabled() || ! net_is_completely_disabled(); + + if (run_per_second_events) { + periodic_timer_launch(second_timer, &one_second); + } else { + periodic_timer_disable(second_timer); + } + } + -/** Number of libevent errors in the last second: we die if we get too many. */ -static int n_libevent_errors = 0; -/** Last time that second_elapsed_callback was called. */ +/** Last time that update_current_time was called. */ static time_t current_second = 0; +/** Last time that update_current_time updated current_second. */ +static monotime_coarse_t current_second_last_changed; + +/** + * Set the current time to "now", which should be the value returned by + * time(). Check for clock jumps and track the total number of seconds we + * have been running. + */ +void +update_current_time(time_t now) +{ + if (PREDICT_LIKELY(now == current_second)) { + /* We call this function a lot. Most frequently, the current second + * will not have changed, so we just return. */ + return; + } + + const time_t seconds_elapsed = current_second ? (now - current_second) : 0; + + /* Check the wall clock against the monotonic clock, so we can + * better tell idleness from clock jumps and/or other shenanigans. */ + monotime_coarse_t last_updated; + memcpy(&last_updated, &current_second_last_changed, sizeof(last_updated)); + monotime_coarse_get(&current_second_last_changed); + + /** How much clock jumping do we tolerate? */ +#define NUM_JUMPED_SECONDS_BEFORE_WARN 100 + + /** How much idleness do we tolerate? */ +#define NUM_IDLE_SECONDS_BEFORE_WARN 3600 + + if (seconds_elapsed < -NUM_JUMPED_SECONDS_BEFORE_WARN) { + // moving back in time is always a bad sign. + circuit_note_clock_jumped(seconds_elapsed, false); + } else if (seconds_elapsed >= NUM_JUMPED_SECONDS_BEFORE_WARN) { + /* Compare the monotonic clock to the result of time(). */ + const int32_t monotime_msec_passed = + monotime_coarse_diff_msec32(&last_updated, + &current_second_last_changed); + const int monotime_sec_passed = monotime_msec_passed / 1000; + const int discrepancy = monotime_sec_passed - (int)seconds_elapsed; + /* If the monotonic clock deviates from time(NULL), we have a couple of + * possibilities. On some systems, this means we have been suspended or + * sleeping. Everywhere, it can mean that the wall-clock time has + * been changed -- for example, with settimeofday(). + * + * On the other hand, if the monotonic time matches with the wall-clock + * time, we've probably just been idle for a while, with no events firing. + * we tolerate much more of that. + */ + const bool clock_jumped = abs(discrepancy) > 2; + + if (clock_jumped || seconds_elapsed >= NUM_IDLE_SECONDS_BEFORE_WARN) { + circuit_note_clock_jumped(seconds_elapsed, ! clock_jumped); + } + } else if (seconds_elapsed > 0) { + stats_n_seconds_working += seconds_elapsed; + } + + update_approx_time(now); + current_second = now; +} /** Libevent callback: invoked once every second. */ static void @@@ -2568,33 -2534,34 +2594,21 @@@ second_elapsed_callback(periodic_timer_ * could use Libevent's timers for this rather than checking the current * time against a bunch of timeouts every second. */ time_t now; - size_t bytes_written; - size_t bytes_read; - int seconds_elapsed; (void)timer; (void)arg; - n_libevent_errors = 0; - - /* log_notice(LD_GENERAL, "Tick."); */ now = time(NULL); - update_approx_time(now); - /* the second has rolled over. check more stuff. */ - seconds_elapsed = current_second ? (int)(now - current_second) : 0; + /* We don't need to do this once-per-second any more: time-updating is + * only in this callback _because it is a callback_. It should be fine + * to disable this callback, and the time will still get updated. + */ + update_current_time(now); - /* the second has rolled over. check more stuff. */ - // remove this once it's unneeded - bytes_read = (size_t)(stats_n_bytes_read - stats_prev_n_read); - bytes_written = (size_t)(stats_n_bytes_written - stats_prev_n_written); - stats_prev_n_read = stats_n_bytes_read; - stats_prev_n_written = stats_n_bytes_written; - - control_event_bandwidth_used((uint32_t)bytes_read,(uint32_t)bytes_written); - control_event_stream_bandwidth_used(); - control_event_conn_bandwidth_used(); - control_event_circ_bandwidth_used(); - control_event_circuit_cell_stats(); + /* Maybe some controller events are ready to fire */ + control_per_second_events(); -/** If more than this many seconds have elapsed, probably the clock - * jumped: doesn't count. */ -#define NUM_JUMPED_SECONDS_BEFORE_WARN 100 - if (seconds_elapsed < -NUM_JUMPED_SECONDS_BEFORE_WARN || - seconds_elapsed >= NUM_JUMPED_SECONDS_BEFORE_WARN) { - circuit_note_clock_jumped(seconds_elapsed); - } else if (seconds_elapsed > 0) - stats_n_seconds_working += seconds_elapsed; - run_scheduled_events(now); - - current_second = now; /* remember which second it is, for next time */ } #ifdef HAVE_SYSTEMD_209

1 0

[tor/master] Give responsibility for waking up from DORMANT to a mainloop event
by nickm＠torproject.org 10 May '18

10 May '18

commit a1a7ebfb8dbb9b104771e99571b6a60c70ee1dbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 13:41:04 2018 -0400 Give responsibility for waking up from DORMANT to a mainloop event Closes ticket 26064. --- changes/ticket26064 | 5 ++++ src/or/hibernate.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hibernate.h | 1 + src/or/main.c | 2 ++ 4 files changed, 81 insertions(+) diff --git a/changes/ticket26064 b/changes/ticket26064 new file mode 100644 index 000000000..6efb8a483 --- /dev/null +++ b/changes/ticket26064 @@ -0,0 +1,5 @@ + o Minor features (accounting): + - When we become dormant, use a scheduled event to wake up at the right + time. Previously, we would use the per-second timer to check whether + to wake up, but we no longer have any per-second timers enabled when + the network is disabled. Closes ticket 26064. diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 98f32adb1..b83167d20 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -52,6 +52,10 @@ static time_t hibernate_end_time = 0; * we aren't shutting down. */ static time_t shutdown_time = 0; +/** A timed event that we'll use when it's time to wake up from + * hibernation. */ +static mainloop_event_t *wakeup_event = NULL; + /** Possible accounting periods. */ typedef enum { UNIT_MONTH=1, UNIT_WEEK=2, UNIT_DAY=3, @@ -131,6 +135,8 @@ static time_t start_of_accounting_period_after(time_t now); static time_t start_of_accounting_period_containing(time_t now); static void accounting_set_wakeup_time(void); static void on_hibernate_state_change(hibernate_state_t prev_state); +static void hibernate_schedule_wakeup_event(time_t now, time_t end_time); +static void wakeup_event_callback(mainloop_event_t *ev, void *data); /** * Return the human-readable name for the hibernation state state @@ -936,6 +942,63 @@ hibernate_go_dormant(time_t now) or_state_mark_dirty(get_or_state(), get_options()->AvoidDiskWrites ? now+600 : 0); + + hibernate_schedule_wakeup_event(now, hibernate_end_time); +} + +/** + * Schedule a mainloop event at end_time to wake up from a dormant + * state. We can't rely on this happening from second_elapsed_callback, + * since second_elapsed_callback will be shut down when we're dormant. + * + * (Note that We might immediately go back to sleep after we set the next + * wakeup time.) + */ +static void +hibernate_schedule_wakeup_event(time_t now, time_t end_time) +{ + struct timeval delay = { 0, 0 }; + + if (now >= end_time) { + // In these cases we always wait at least a second, to avoid running + // the callback in a tight loop. + delay.tv_sec = 1; + } else { + delay.tv_sec = (end_time - now); + } + + if (!wakeup_event) { + wakeup_event = mainloop_event_postloop_new(wakeup_event_callback, NULL); + } + + mainloop_event_schedule(wakeup_event, &delay); +} + +/** + * Called at the end of the interval, or at the wakeup time of the current + * interval, to exit the dormant state. + **/ +static void +wakeup_event_callback(mainloop_event_t *ev, void *data) +{ + (void) ev; + (void) data; + + const time_t now = time(NULL); + accounting_run_housekeeping(now); + consider_hibernation(now); + if (hibernate_state != HIBERNATE_STATE_DORMANT) { + /* We woke up, so everything's great here */ + return; + } + + /* We're still dormant. */ + if (now < interval_wakeup_time) + hibernate_end_time = interval_wakeup_time; + else + hibernate_end_time = interval_end_time; + + hibernate_schedule_wakeup_event(now, hibernate_end_time); } /** Called when hibernate_end_time has arrived. */ @@ -1126,6 +1189,16 @@ on_hibernate_state_change(hibernate_state_t prev_state) } } +/** Free all resources held by the accounting module */ +void +accounting_free_all(void) +{ + mainloop_event_free(wakeup_event); + hibernate_state = HIBERNATE_STATE_INITIAL; + hibernate_end_time = 0; + shutdown_time = 0; +} + #ifdef TOR_UNIT_TESTS /** * Manually change the hibernation state. Private; used only by the unit diff --git a/src/or/hibernate.h b/src/or/hibernate.h index 85fb42864..4bbda6694 100644 --- a/src/or/hibernate.h +++ b/src/or/hibernate.h @@ -30,6 +30,7 @@ int getinfo_helper_accounting(control_connection_t *conn, const char *question, char **answer, const char **errmsg); uint64_t get_accounting_max_total(void); +void accounting_free_all(void); #ifdef HIBERNATE_PRIVATE /** Possible values of hibernate_state */ diff --git a/src/or/main.c b/src/or/main.c index c3505a2d9..9cbe5c8d9 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3618,6 +3618,8 @@ tor_free_all(int postfork) hs_free_all(); dos_free_all(); circuitmux_ewma_free_all(); + accounting_free_all(); + if (!postfork) { config_free_all(); or_state_free_all();

1 0

[tor/master] Merge branch 'ticket26064'
by nickm＠torproject.org 10 May '18

10 May '18

commit beca6a585c5cd594333ae07b0ae3326188f9d67c Merge: a4a7939ae a1a7ebfb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:05:15 2018 -0400 Merge branch 'ticket26064' changes/ticket26064 | 5 ++++ src/or/hibernate.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/hibernate.h | 1 + src/or/main.c | 2 ++ 4 files changed, 81 insertions(+)

1 0

[translation/support-topics_completed] Update translations for support-topics_completed
by translation＠torproject.org 10 May '18

10 May '18

commit ce6577a68fc715f1ea3af18e29a66b92ce512338 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 10 12:49:42 2018 +0000 Update translations for support-topics_completed --- id.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/id.json b/id.json index 946d325b3..2ff7ae3ef 100644 --- a/id.json +++ b/id.json @@ -5,18 +5,18 @@ "label": "Most Frequently Asked Questions" }, "tbb": { - "path": "#tor-browser", - "control": "tor-browser", + "path": "#tbb", + "control": "tbb", "label": "Peramban Tor" }, "tormessenger": { - "path": "#tor-messenger", - "control": "tor-messenger", + "path": "#tormessenger", + "control": "tormessenger", "label": "Tor Messenger" }, "tormobile": { - "path": "#tor-mobile", - "control": "tor-mobile", + "path": "#tormobile", + "control": "tormobile", "label": "Tor Mobile" }, "gettor": { @@ -25,8 +25,8 @@ "label": "GetTor" }, "connecting": { - "path": "#connecting-to-tor", - "control": "connecting-to-tor", + "path": "#connectingtotor", + "control": "connectingtotor", "label": "Terhubung ke Tor" }, "censorship": { @@ -45,13 +45,13 @@ "label": "Operator" }, "onionservices": { - "path": "#onion-services", - "control": "onion-services", + "path": "#onionservices", + "control": "onionservices", "label": "Layanan Onion" }, - "miscellaneus": { - "path": "#miscellaneus", - "control": "miscellaneus", + "misc": { + "path": "#misc", + "control": "lain-lain", "label": "Lain-lain" } }

1 0

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

10 May '18

commit ac8a0416296db456bbb7dd9e26e3fbf143e39096 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 10 12:49:38 2018 +0000 Update translations for support-topics --- id.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id.json b/id.json index 46516ac86..2ff7ae3ef 100644 --- a/id.json +++ b/id.json @@ -51,7 +51,7 @@ }, "misc": { "path": "#misc", - "control": "misc", - "label": "Misc" + "control": "lain-lain", + "label": "Lain-lain" } }

1 0

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

10 May '18

commit b46102b8cd50959e5523e6223b65a6c2cbc2c2ab Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 10 12:49:30 2018 +0000 Update translations for support-tbb --- id.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id.json b/id.json index 73dbcf5e9..600ae0101 100644 --- a/id.json +++ b/id.json @@ -3,7 +3,7 @@ "id": "#tbb-1", "control": "tbb-1", "title": "Apa masalah-masalah paling umum pada versi stabil termutakhir di Tor Browser?", - "description": "Setiap kami merilis peramban Tor Browser stabil terbaru, kami membuat posting blog yang menjelaskan fitur-fitur terbaru dan masalah yang diketahui. Jika Anda mengalami masalah dengan peramban Tor Browser setelah melakukan pembaruan, silakan lihat <a href=\"https://blog.torproject.org\">https://blog.torproject.org</a>apakah masalah yang Anda alami terdaftar di sana." + "description": "Setiap kami merilis Tor Browser stabil terbaru, kami membuat posting blog yang menjelaskan fitur-fitur terbaru dan masalah yang diketahui. Jika Anda mengalami masalah dengan Tor Browser setelah melakukan pembaruan, silakan lihat <a href=\"https://blog.torproject.org\">https://blog.torproject.org</a>apakah masalah yang Anda alami terdaftar di sana." }, "tbb-2": { "id": "#tbb-2", @@ -45,7 +45,7 @@ "id": "#tbb-7-1", "control": "tbb-7-1", "title": "Saya mengalami masalah ketika menggunakan fitur-fitur di Facebook, Twitter atau situs web lain jika menggunakan Tor Browser. ", - "description": "Sometimes Javascript-heavy websites can have functional issues over Tor Browser. The simplest fix is to click on the \"onion menu,\" then click on the security slider. Set your security to \"low.\"" + "description": "Kadang situs web yang menggunakan Javascript dengan banyak akan mendapat masalah ketika diakses dengan Tor Browser. Cara paling sederhana untuk mengatasi hal ini adalah klik \"Onion Menu\" lalu klik security. Setel tingkat keamanan menjadi \"rendah\"." }, "tbb-8": { "id": "#tbb-8", @@ -75,7 +75,7 @@ "id": "#tbb-12", "control": "tbb-12", "title": "Apakah saya dapat menggunakan flash di Tor Browser?", - "description": "Flash is disabled in Tor Browser, and we recommend you do not enable it. We don’t think Flash is safe to use in any browser — it's a very insecure piece of software that can easily compromise your privacy or serve you malware. Fortunately, most websites, devices, and other browsers are moving away from the use of Flash." + "description": "Flash dinonaktifkan di Tor Browser, dan kami menyarankan Anda untuk tidak mengaktifkannya. Menurut kami, Flash tidak aman digunakan di peramban apa pun — Flash adalah software yang sangat tidak aman yang dengan sangat mudah menghilangkan privasi Anda atau memberikan malware. Untungnya sebagian besar situs web, alat, dan peramban lain sudah tidak lagi menggunakan Flash." }, "tbb-13": { "id": "#tbb-13", @@ -105,7 +105,7 @@ "id": "#tbb-17", "control": "tbb-17", "title": "Apakah aman untuk menjalankan Tor Browser dan peramban lain dalam waktu bersamaan?", - "description": "If you run Tor Browser and another browser at the same time, it won't affect Tor's performance or privacy properties. However, be aware that your other browser is not keeping your activity private, and you may forget and accidentally use that non-private browser to do something that you intended to do in Tor Browser." + "description": "Jika Anda menjalankan Tor Browser dan peramban lain secara bersamaan, kinarja Tor atau privasi tidak akan terpengaruh. Namun, sadarlah bahwa peramban lain tersebut tidak membuat kegiatan Anda menjadi privat, dan Anda mungkin akan lupa lalu tidak sengaja menggunakan peramban tadi untuk melakukan sesuatu yang Anda ingin lakukan dengan Tor Browser." }, "tbb-18": { "id": "#tbb-18", @@ -129,7 +129,7 @@ "id": "#tbb-21", "control": "tbb-21", "title": "Bagaimana cara melihat pesan log di Tor Browser?", - "description": "Click the button labelled \"Copy Tor Log To Clipboard\" that appears in the dialog window when Tor Browser is first connecting to the network. If Tor Browser is already open, click on the Torbutton icon (the small green onion at the top-left of the screen), then \"Open Network Settings\", then \"Copy Tor Log To Clipboard.\". Once you have copied the log, you will be able to paste it into a text editor or email client." + "description": "Klik tombol bernama \"Copy Tor Log To Clipboard\" yang muncul di jendela ketika Tor Browser pertama kali terhubung ke jaringan. Jika Tor Browser sudah buka, kik ikon Torbutton (gambar bawang kecil hijau di kiri atas layar), lalu klik \"Open Network Settings\", dan klik \"Copy Tor Log To Clipboard.\". Setelah log tersebut di-copy, paste ke text editor seperti Notepad atau program email client." }, "tbb-22": { "id": "#tbb-22", @@ -225,7 +225,7 @@ "id": "#tbb-37", "control": "tbb-37", "title": "Saya memerlukan Tor Browser dalam bahasa selain bahasa Inggris.", - "description": "We currently offer Tor Browser in the following languages:<ul><li>English (en-US)</li><li>\"العربية\" (ar)</li><li>Deutsch (de)</li><li>Español (es-ES)</li><li> فارسى (fa)</li><li>Français (fr)</li><li>Italiano (it)</li><li>日本語 (ja)</li><li>Korean (ko)</li><li>Nederlands (nl)</li><li>Polish (pl)</li><li>Português (pt-BR)</li><li>Русский (ru)</li><li>Türkçe (tr)</li><li>Vietnamese (vi)</li><li>简体字 (zh-CN)</li></ul>" + "description": "Saat ini kami menawarkan Tor Browser dalam bahasa-bahasa berikut ini:<ul><li>English (en-US)</li><li>\"العربية\" (ar)</li><li>Deutsch (de)</li><li>Español (es-ES)</li><li> فارسى (fa)</li><li>Français (fr)</li><li>Italiano (it)</li><li>日本語 (ja)</li><li>Korean (ko)</li><li>Nederlands (nl)</li><li>Polish (pl)</li><li>Português (pt-BR)</li><li>Русский (ru)</li><li>Türkçe (tr)</li><li>Vietnamese (vi)</li><li>简体字 (zh-CN)</li></ul>" }, "tbb-38": { "id": "#tbb-38",

1 0

[tor/release-0.3.3] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 10 May '18

10 May '18

commit 62b224f724568459b9ab2984b196c6d15046bf29 Merge: ff46d08fd 59812789f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:20:38 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 May '18

10 May '18

commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb Merge: 394f102ea aa08c1970 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:02:10 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc src/or/networkstatus.c index dd82f6681,fdaa469fa..3d99dd9ee --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -1654,9 -1685,7 +1654,8 @@@ any_client_port_set(const or_options_t return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set); + options->DNSPort_set || + options->HTTPTunnelPort_set); } /**

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0