commit 0a2e018bc8822701b5218c83852a81bdcf85f58e Merge: de810e6 05d9d63 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 30 09:57:52 2014 -0500

Merge commit '05d9d63548dff686f66b2f1322a7f80e452462a1'

torrc_templates/authority.tmpl | 33 +++++++++++++++++++++++++++------ torrc_templates/bridge-v6.tmpl | 2 +- torrc_templates/bridge.tmpl | 7 ++----- torrc_templates/bridgeauthority.tmpl | 2 +- torrc_templates/bridgeclient.tmpl | 13 ++++++++++++- torrc_templates/client.tmpl | 8 +++++++- torrc_templates/common.i | 27 +++++++++++++++++++++++++++ torrc_templates/exit-v4.i | 16 +++++++++++++++- torrc_templates/exit-v6.i | 16 +++++++++++++++- torrc_templates/relay-non-exit.tmpl | 8 +++++++- 10 files changed, 114 insertions(+), 18 deletions(-)