[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

[nickm at torproject.org]

commit f87aa4555d06b2707e21df39d1bc7f14161a2cb4
Merge: 0116eae 608c12b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 28 11:12:51 2016 -0400

    Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8

 changes/bug18812       |  4 ++++
 src/or/connection_or.c | 51 +++++++++++++++++++++++++++++++++++++++++++++-----
 src/or/routerlist.c    |  2 ++
 3 files changed, 52 insertions(+), 5 deletions(-)