Merge branch 'maint-0.2.3'
commitdc014c97472e3adf2306938841c13de0040a2ff0
authorRoger Dingledine <arma@torproject.org>
Sat, 22 Sep 2012 13:31:09 +0000 (22 09:31 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 22 Sep 2012 13:31:09 +0000 (22 09:31 -0400)
treea76749a07f135cbb845277c817106c0a3b373029
parenta2f57b97998b325c059d2fac06ca37d4b4dc52a3
parentc88a4c51b4cd2d6d584231a44a6e4ea4ac7396a0
Merge branch 'maint-0.2.3'
src/or/config.c