Nick Mathewson 74a8555d2b Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 ... Conflicts: contrib/dist/tor.service.in		2014-07-30 14:00:21 -04:00
..
suse	Deal with the aftermath of sorting contrib	2014-04-28 11:59:55 -04:00
rc.subr	Clean the contrib directory with torch and machete.	2014-04-28 11:34:53 -04:00
tor.service.in	Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5	2014-07-30 14:00:21 -04:00
tor.sh.in	Clean the contrib directory with torch and machete.	2014-04-28 11:34:53 -04:00
torctl.in	Clean the contrib directory with torch and machete.	2014-04-28 11:34:53 -04:00