[tor-commits] [tor/master] Merge branch 'bug2750-v3' into bug2948

[nickm at torproject.org]

commit 130db1bdebb7089d78db6d3e0f7497ac5ee71f73
Merge: 4cbbb92 adc3100
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Mon Apr 18 13:36:19 2011 -0700

    Merge branch 'bug2750-v3' into bug2948

 changes/bug2750      |    6 ++++++
 src/or/routerparse.c |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)