merge torrc.in and sample-server-torrc.in
commitf53fe3cd7f1af9f542ba49f940def20c1f506a0f
authorRoger Dingledine <arma@torproject.org>
Thu, 20 Nov 2003 18:22:09 +0000 (20 18:22 +0000)
committerRoger Dingledine <arma@torproject.org>
Thu, 20 Nov 2003 18:22:09 +0000 (20 18:22 +0000)
tree1da02973bc99c1011cc9449275ef73ada388e3be
parent975bb680106f58bc1fced05a932f452e661e0157
merge torrc.in and sample-server-torrc.in

svn:r858
src/config/sample-server-torrc.in [deleted file]
src/config/torrc.in