commit 406bc9527125dccdf68745a07100bd1dc48a9903 Merge: c26aaf9 e217569 Author: Roger Dingledine arma@torproject.org Date: Wed Feb 29 13:23:23 2012 -0500

Merge branch 'maint-0.2.2'

changes/maatuska-ip | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)