Fix experimental-api feature after refactoring

Important refactoring happened recently which broke the "experimental-api" feature.

Fixes are quite simple.

Signed-off-by: David Goulet dgoulet@torproject.org