Hidden-service related circuits

XXX Tracking expected hidden service use (client-side and hidserv-side)