commit 963e70673a01f0cdea1e5533b02128a84dfaa0d8 Merge: 387de08 e2537a5 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 13 20:30:51 2016 -0500 Merge remote-tracking branch 'teor/fix-frac-paths-comment' src/or/nodelist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)