[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 639766dbc39c37d9864b99bd024faa5967b22c80
Merge: a01e4a1a9 49b5ad6b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 15 14:40:35 2017 -0400

    Merge branch 'maint-0.3.1'
    
    Resolve conflict with 23532 code.

 changes/bug23533    | 4 ++++
 src/or/channel.c    | 2 +-
 src/or/channeltls.c | 4 ++--
 src/or/rephist.c    | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --cc src/or/channeltls.c
index fe1e7e91d,c6a0bb21e..a08e7cdfd
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@@ -1827,9 -1823,8 +1827,9 @@@ channel_tls_process_netinfo_cell(cell_
    /** Warn when we get a netinfo skew with at least this value. */
  #define NETINFO_NOTICE_SKEW 3600
    if (labs(apparent_skew) > NETINFO_NOTICE_SKEW &&
 -      connection_or_digest_is_known_relay(chan->conn->identity_digest)) {
 +      (started_here ||
-        connection_or_digest_is_known_relay(identity_digest))) {
-     int trusted = router_digest_is_trusted_dir(identity_digest);
++       connection_or_digest_is_known_relay(chan->conn->identity_digest))) {
+     int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest);
      clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL,
                         "NETINFO cell", "OR");
    }