[tor-commits] [tor/master] Merge branch 'bug2511' into bug2510

[nickm at torproject.org]

commit cb101c48155729fa05cef2f255d1de0ad40d6b72
Merge: 7d2a91f 72b89c9
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Mar 14 15:52:53 2011 -0400

    Merge branch 'bug2511' into bug2510

 src/or/or.h         |    1 +
 src/or/routerlist.c |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)