commit a617001fd4c8d911b109bbfcd17a051fcdc78c87 Merge: 78307ed18 d22ed05dc Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 3 09:47:25 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1279'

src/feature/rend/rendcommon.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)