move the tor program back to usr/bin/

svn:r1119

src/or/Makefile.am

@@ -2,7 +2,7 @@ TESTS = test
 
 noinst_PROGRAMS = test
 
-sbin_PROGRAMS = tor
+bin_PROGRAMS = tor
 
 tor_SOURCES = buffers.c circuit.c command.c connection.c \
              connection_or.c config.c dirserv.c \