Merge remote-tracking branch 'nickm/bug5438'
commit6718b6e78106a110894654db7bf7cc848e2d04c4
authorRoger Dingledine <arma@torproject.org>
Mon, 23 Apr 2012 06:03:40 +0000 (23 02:03 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 23 Apr 2012 06:03:40 +0000 (23 02:03 -0400)
tree5836ce703613f4b920ca2f1bbf4559710963b02a
parent54d0cdeb939fb19f6e430a62c255acac87b68f6a
parent548f2e32cdeb98184ffc831841aceebdd3514a6e
Merge remote-tracking branch 'nickm/bug5438'
src/config/torrc.sample.in