Add hidden services support
Merge branch 'feature/hiddenservices'