Merge branch 'maint-0.2.2'
commit18f1b354ece34947e9a17b5cefb33cfbd73641e7
authorRoger Dingledine <arma@torproject.org>
Wed, 18 May 2011 01:15:24 +0000 (17 21:15 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 18 May 2011 01:15:24 +0000 (17 21:15 -0400)
tree0575329fad3216f17cdb73919bf2eedb0b5806bd
parent92081f3cdc2e91f7eb9954af2b647ab0bc65d047
parent073fed06c458fac428b2377b4828412acb7d3802
Merge branch 'maint-0.2.2'
src/or/config.c