commit ea0518f209959250dd07272d739a6d9aa9531444 Merge: d5bb0d7 f885c60 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 24 10:21:09 2011 -0400

Merge remote-tracking branch 'sebastian/bug4293'

src/or/config.c | 3 ++- src/or/rephist.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-)