[tor-commits] [tor/master] Merge branch 'maint-0.4.4' into master

[asn at torproject.org]

commit 438aba6c0b70c5becc8ba2c17fad98156901f64b
Merge: 84e825598a a914ac5d7c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Oct 7 13:42:57 2020 +0300

    Merge branch 'maint-0.4.4' into master

 changes/bug40129                     | 4 ++++
 src/feature/dircache/dircache_stub.c | 2 ++
 src/feature/relay/router.c           | 5 +++++
 3 files changed, 11 insertions(+)

diff --cc src/feature/relay/router.c
index 8233ebe47f,75a3d2f35c..5ca21964b6
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@@ -2636,12 -2521,11 +2640,13 @@@ log_addr_has_changed(int severity
               "Guessed our IP address as %s (source: %s).",
               addrbuf_cur, source);
  }
+ ENABLE_GCC_WARNING("-Wmissing-noreturn")
  
 -/** Check whether our own address as defined by the Address configuration
 - * has changed. This is for routers that get their address from a service
 - * like dyndns. If our address has changed, mark our descriptor dirty. */
 +/** Check whether our own address has changed versus the one we have in our
 + * current descriptor.
 + *
 + * If our address has changed, call ip_address_changed() which takes
 + * appropriate actions. */
  void
  check_descriptor_ipaddress_changed(time_t now)
  {