Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4
commit8b4728ebd681c395e4a34eabf50035ebd1f05d7d
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Mar 2013 16:38:11 +0000 (15 12:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Mar 2013 16:38:11 +0000 (15 12:38 -0400)
treed76b12896da2233f09c3d4c1579afe9c8f5790bc
parent0cf327dc7874ae0a021054b78cbb7b24a11aa8fe
parent686aaa5c4c95ebd2c3ddfe46a237014e2813a9e7
Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4
src/or/config.c