[tor-commits] [tor/master] Merge branch 'tor-github/pr/1288'

commit f5fa283a0407437f9d4ef12cd8086da71f04a144 Merge: a816742f3 9c798dd5a Author: David Goulet <dgoulet@torproject.org> Date: Wed Sep 4 08:34:26 2019 -0400 Merge branch 'tor-github/pr/1288' src/lib/err/torerr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)