update about merge status; fix a link [(diff)][1] [1]: https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6?action=diff&version=16 URL: https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6?version=16