commit a3b8286b0e5ca3415750d6b6813261817893c4da Merge: 39f4554 9bb3bcb Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 9 08:30:55 2016 -0500

Merge branch 'maint-0.2.9'

changes/bug20715 | 4 ++++ src/or/routerlist.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)