commit 030d3d52f5bf03d2e611c7f208a56b3e45d47210 Merge: 98682f689 35055cfa7 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 09:46:23 2017 -0500

Merge remote-tracking branch 'teor/comment24575'

src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)