commit d8d36c7dc336d7892178cb23aa4d195e06bf3e0d
Merge: 196be8ca2 d57a04b64
Author: teor <teor(a)torproject.org>
Date: Fri Nov 15 11:28:29 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1536'
src/feature/dirauth/dirauth_config.h | 28 +++++++-------
src/feature/relay/relay_config.h | 72 ++++++++++++++++++------------------
src/feature/relay/transport_config.h | 18 ++++-----
3 files changed, 59 insertions(+), 59 deletions(-)