commit 4314d1a15ab1697235d911c9c187e1f48983048a Merge: e0e4b84 77e5122 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 11:38:51 2012 -0400

Merge remote-tracking branch 'public/bug4572'

changes/bug4572 | 6 ++++++ doc/tor.1.txt | 4 ---- src/or/config.c | 3 +-- src/or/dirserv.c | 3 +-- src/or/or.h | 4 ---- 5 files changed, 8 insertions(+), 12 deletions(-)