Move the torify manpage into the doc dir

contrib/Makefile.am

@@ -3,10 +3,8 @@ DIST_SUBDIRS = osx suse
 
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
+EXTRA_DIST = exitlist tor-tsocks.conf tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
 
 conf_DATA = tor-tsocks.conf
 
 bin_SCRIPTS = torify
-
-man_MANS = torify.1

doc/Makefile.am

@@ -2,9 +2,9 @@
 EXTRA_DIST = HACKING                                         \
              tor-resolve.1 tor-gencert.1                     \
              tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
-             tor-win32-mingw-creation.txt
+             tor-win32-mingw-creation.txt torify.1
 
-man_MANS = tor.1 tor-resolve.1 tor-gencert.1
+man_MANS = tor.1 tor-resolve.1 tor-gencert.1 torify.1
 
 SUBDIRS = design-paper spec