commit cc3f0ba1e8b49f0dc2a40c80d741808380e0ab45 Merge: 29825f0 4fbc615 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 21 11:25:29 2011 -0400

Merge branch 'ticket4200'

changes/remove_TRACK_SERVED_TIME | 4 + changes/ticket4200 | 5 ++ src/or/config.c | 10 +++- src/or/dirserv.c | 7 +-- src/or/geoip.c | 10 ++- src/or/main.c | 5 ++ src/or/or.h | 5 -- src/or/rephist.c | 131 +++++++++++++++++++++++++++++++++++++- src/or/rephist.h | 5 ++ 9 files changed, 165 insertions(+), 17 deletions(-)