Okay, this branch is `fs_refactor`. It's based on my sandbox_refactor branch (see legacy/trac#26533) , so I made a PR at https://github.com/nmathewson/tor/pull/1 if you only want to see the changes since that branch.