[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit d793a988cd9f3dca6b388857102ce7aabf7bbb9d
Merge: 4e2a7cd bc9a0f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 28 11:22:48 2016 -0400

    Merge branch '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(-)