commit 2c4d7d8c65b3783fa9213cc632d398d0d1b6ef5c Merge: 238b1f315 9c33d3611 Author: teor teor@torproject.org Date: Thu Feb 6 08:39:46 2020 +1000

Merge branch 'pr1701-fix-typo'

changes/ticket32230 | 3 +++ configure.ac | 36 +++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-)