  o Documentation (manpage):
    - Alphabetize the General Options section of the tor
      manpage.  Closes ticket 32708.
