* debian-merge: (99 commits)
  Changefile cleanup
  Upstream tarballs no longer ship an AUTHORS file, or the website
  torify.1 manpage gets installed by upstream
  And stop it from falling over because it tries to call non-existant build scripts for building html files we do not need anyway
  Try to build manpages
  The original design paper is no longer shipped with Tor.
  Update how we patch manpages
  Removed versioned libssl build dependency since that is no longer needed
  New upstream version
  Mark 160 and 161 as Finished.
  elevate a changelog entry, and get my mailto out of the man page
  Make expand_filename into a tor_strdup() alias on windows.
  Remove some redundant code in options_save_current()
  Expand homedirs in paths passed to tor-checkkey
  Zero a cipher completely before freeing it
  Break early on unknown extendcircuit purpose
  Fix a memory leak, found by coverity
  Remove some redundand code in control.c
  Update the osx dmg creation instructions
  network-status-version must come first in a vote/consensus
  ...