Merge branch 'bug1384'
commit9265190b16cae3b95f73bfb478e97b4fcfba0e17
authorNick Mathewson <nickm@torproject.org>
Mon, 2 Aug 2010 16:53:52 +0000 (2 12:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 Aug 2010 16:53:52 +0000 (2 12:53 -0400)
treef926c9d90e1af35c34298149a132c782d24dac58
parent73a4c0690edd49ea8fec2b8034bc2b0b681acdb0
parenta9d055c5c516924b2e87e416b154bf220b0a914e
Merge branch 'bug1384'
src/or/config.c