back out a little bit of r11817 to preserve current behavior.
commit4f23045e58ff5d55adcaf36290cbfe12380f4df9
authorRoger Dingledine <arma@torproject.org>
Tue, 9 Oct 2007 21:12:48 +0000 (9 21:12 +0000)
committerRoger Dingledine <arma@torproject.org>
Tue, 9 Oct 2007 21:12:48 +0000 (9 21:12 +0000)
tree02f33114ef9ff3862f23fa6e32fc34116c1e6a9d
parenta5851939c0becdeb5ce5b290ab3e4d9baf798168
back out a little bit of r11817 to preserve current behavior.
some other behavior changes left in.

svn:r11821
src/or/directory.c
src/or/router.c