Merge branch 'maint-0.3.3'

This commit is contained in:
Nick Mathewson 2018-05-09 11:53:18 -04:00
commit 61d5ce83a1
3 changed files with 6 additions and 7 deletions

3
changes/bug25761 Normal file
View File

@ -0,0 +1,3 @@
o Major bugfixes (onion service):
- Correctly detect when onion services get disabled after HUP.
Fixes bug 25761; bugfix on 0.3.2.1.

View File

@ -878,11 +878,6 @@ register_all_services(void)
tor_assert(hs_service_staging_list);
/* We'll save us some allocation and computing time. */
if (smartlist_len(hs_service_staging_list) == 0) {
return;
}
/* Allocate a new map that will replace the current one. */
new_service_map = tor_malloc_zero(sizeof(*new_service_map));
HT_INIT(hs_service_ht, new_service_map);

View File

@ -629,10 +629,11 @@ void
rend_service_prune_list(void)
{
smartlist_t *old_service_list = rend_service_list;
/* Don't try to prune anything if we have no staging list. */
if (!rend_service_staging_list) {
return;
rend_service_staging_list = smartlist_new();
}
rend_service_prune_list_impl_();
if (old_service_list) {
/* Every remaining service in the old list have been removed from the