mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 13:34:59 +02:00
Merge branch 'maint-0.3.3'
This commit is contained in:
commit
61d5ce83a1
3
changes/bug25761
Normal file
3
changes/bug25761
Normal 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.
|
@ -878,11 +878,6 @@ register_all_services(void)
|
|||||||
|
|
||||||
tor_assert(hs_service_staging_list);
|
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. */
|
/* Allocate a new map that will replace the current one. */
|
||||||
new_service_map = tor_malloc_zero(sizeof(*new_service_map));
|
new_service_map = tor_malloc_zero(sizeof(*new_service_map));
|
||||||
HT_INIT(hs_service_ht, new_service_map);
|
HT_INIT(hs_service_ht, new_service_map);
|
||||||
|
@ -629,10 +629,11 @@ void
|
|||||||
rend_service_prune_list(void)
|
rend_service_prune_list(void)
|
||||||
{
|
{
|
||||||
smartlist_t *old_service_list = rend_service_list;
|
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) {
|
if (!rend_service_staging_list) {
|
||||||
return;
|
rend_service_staging_list = smartlist_new();
|
||||||
}
|
}
|
||||||
|
|
||||||
rend_service_prune_list_impl_();
|
rend_service_prune_list_impl_();
|
||||||
if (old_service_list) {
|
if (old_service_list) {
|
||||||
/* Every remaining service in the old list have been removed from the
|
/* Every remaining service in the old list have been removed from the
|
||||||
|
Loading…
Reference in New Issue
Block a user