[tor-commits] [spec/master] Merge pull request #49 from TheTorProject/feature/df-0.2