This is based on a pair of patches from A. Costa. I couldn't apply those directly, since they changed the generated *roff files, not the asciidoc source. Fixes Tor bug 6500 and Debian bug 683359.
