commit f4e51990b911161b26138f40f3d370eeafd9ac2f Merge: b2470f514 9876575d2 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 12 08:17:48 2018 -0400

Merge remote-tracking branch 'rl1987/bug26283'

changes/bug26283 | 4 ++++ src/or/routerlist.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)