Bugfixes on tor.util, tor.generic done, started on tor.folders.