Merge branch 'maint-0.2.2'
commit0a4649e6576cacc07c215c481fd1c500cd563a3b
authorRoger Dingledine <arma@torproject.org>
Fri, 20 May 2011 07:03:46 +0000 (20 03:03 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 20 May 2011 07:03:46 +0000 (20 03:03 -0400)
treecc16d185370864236316f3ce9d8db4bc702a3217
parenteecf8835fd8758a3f7a0837ff6c71d9e65d2dd5d
parentb8ffb00cf1ddf4ff1b64335f8677d600a948fffc
Merge branch 'maint-0.2.2'
src/or/config.c
src/or/connection.c
src/or/dns.c
src/or/main.c
src/or/router.c
src/or/router.h