teor authored Sep 13, 2016 and Nick Mathewson committed Sep 13, 2016

* Check consistency between the two single onion torrc options
* Use the more relevant option each time we check for single onion mode
* Clarify log messages
* Clarify comments
* Otherwise, no behaviour change