Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8
commitf87aa4555d06b2707e21df39d1bc7f14161a2cb4
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Jun 2016 15:12:51 +0000 (28 11:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Jun 2016 15:12:51 +0000 (28 11:12 -0400)
treea990e92cc065c4817ce8bdad58cc0282e6cb9673
parent0116eae59a35e4303ca179d6b0fb0302a83e87a1
parent608c12baaf820c33246052e23fd0c65459ed1c5c
Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8
src/or/routerlist.c