Merge remote-tracking branch 'isis/bug20201'
commitf6d7b71719db2e158b28f21d6f4a3861d860b3b0
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Sep 2016 16:20:33 +0000 (21 12:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Sep 2016 16:20:33 +0000 (21 12:20 -0400)
tree4c1bd8bbc14894d4aca79efcdc0258a7c6fe9675
parent62ee4f185f984f11d75522eedcee92d1f15fc7a6
parentf1d7b7b600f2388f347116a30f5bb40d9fa1ff6e
Merge remote-tracking branch 'isis/bug20201'
src/or/config.c