[tor-commits] [chutney/master] Merge remote-tracking branches 'teor/issue-13161-template-tweaks' and 'teor/issue-13161-check-torrc-options'