Commit fe3331b8 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents d47c9276 bf8bb9c5

changes/bug28619

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (hidden service v3):

    - When deleting an ephemeral onion service (DEL_ONION), do not close any

      rendezvous circuits in order to let the existing client connections

      finish by themselves or closed by the application. The HS v2 is doing

      that already so now we have the same behavior for all versions. Fixes

      bug 28619; bugfix on 0.3.3.1-alpha.

src/or/hs_service.c

+4 −2
Original line number Diff line number Diff line
@@ -3140,8 +3140,10 @@ hs_service_del_ephemeral(const char *address) 
    goto err;

  }



  /* Close circuits, remove from map and finally free. */

  close_service_circuits(service);

  /* Close introduction circuits, remove from map and finally free. Notice

   * that the rendezvous circuits aren't closed in order for any existing

   * connections to finish. We let the application terminate them. */

  close_service_intro_circuits(service);

  remove_service(hs_service_map, service);

  hs_service_free(service);