Commit e500ea2e authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'tor-github/pr/1989' into maint-0.4.4

parents 8dd89e43 63a54858
Loading
Loading
Loading
Loading

changes/ticket34087

0 → 100644
+3 −0
Original line number Diff line number Diff line
  o Minor bugfix (onion service v3 client):
    - Remove a BUG() warning that can occur naturally. Fixes bug 34087; bugfix
      on 0.3.2.1-alpha.
+4 −2
Original line number Diff line number Diff line
@@ -1065,8 +1065,10 @@ close_or_reextend_intro_circ(origin_circuit_t *intro_circ)
  tor_assert(intro_circ);

  desc = hs_cache_lookup_as_client(&intro_circ->hs_ident->identity_pk);
  if (BUG(desc == NULL)) {
    /* We can't continue without a descriptor. */
  if (desc == NULL) {
    /* We can't continue without a descriptor. This is possible if the cache
     * was cleaned up between the intro point established and the reception of
     * the introduce ack. */
    goto close;
  }
  /* We still have the descriptor, great! Let's try to see if we can