commit ae94e36a1ddc792fcf8953ea7932f2a9c408dbdf Merge: 5184170 cc35157 Author: Roger Dingledine arma@torproject.org Date: Tue Apr 24 12:19:07 2012 -0400

Merge remote-tracking branch 'nickm/bug2497'

changes/bug2749 | 8 ++++++++ src/or/or.h | 2 +- src/or/routerlist.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-)