repo sync stuff ([diff](https://trac.torproject.org/projects/tor/wiki/user/catalyst?action=diff&version=4)) URL: https://trac.torproject.org/projects/tor/wiki/user/catalyst?version=4