Merge in 'tor-autocircuit'.

This package has a broken dependency. See ticket #298.