[tor-commits] [tor/master] Merge branch 'bug4282_rebased'

commit 5269f2b22e6c93a8a5171c2575b53d6aa88c3ccb Merge: b4b0063 c482c71 Author: Nick Mathewson nickm@torproject.org Date: Fri May 24 13:39:37 2013 -0400

Merge branch 'bug4282_rebased'

changes/bug4282 | 4 ++ src/or/config.c | 37 +++++++++++++++ src/or/config.h | 4 ++ src/or/geoip.c | 67 ++++++++++----------------- src/or/rephist.c | 48 +++++-------------- src/test/test_config.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 79 deletions(-)