Merge remote-tracking branch 'public/bug8158'
commit01184f164f027aa4e34a9f6b90c01120040f63cb
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Feb 2013 18:32:38 +0000 (11 13:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Feb 2013 18:32:38 +0000 (11 13:32 -0500)
treeb8a7924c8be4ed8d6e57d1ab8d282748d4f025a2
parent36e2eb6775a2f52d34423f1319a0be1472506649
parentc8f5f35d6237de0ecd5ddac0a9a4c84915cbe177
Merge remote-tracking branch 'public/bug8158'
src/or/dirserv.c