update tor; upgrade cjdns to master HEAD (protocol version 11)