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

commit b47adcbcabf8b07ffb19b0cfeb02996b07104ccf Merge: 0312da75a 232aa8570 Author: David Goulet <dgoulet@torproject.org> Date: Thu Aug 8 12:30:23 2019 -0400 Merge branch 'tor-github/pr/1183' src/core/or/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)