hs: We need to get rid of a descriptor when entering non-overlap mode

From the discussion here: https://oniongit.eu/asn/tor/merge_requests/3#note_905

It seems the solution is to set the next descriptor as the current one when entering the non-overlap mode.

This is v3 service side thus affecting upstream code.