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

[nickm at torproject.org]

commit 4a14c2cfc7972db39da4fd3a72cfd64d036daf7b
Merge: a7a44f2 0d6f293
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 19 15:56:39 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18809          |  8 ++++---
 src/or/dirserv.c          | 17 +++++++-------
 src/or/dirvote.c          |  7 +++---
 src/or/or.h               |  6 -----
 src/or/router.c           | 57 ++++++++++++++++++++++++-----------------------
 src/or/routerlist.c       |  5 ++---
 src/or/routerparse.c      | 15 +++++++------
 src/test/test_dir.c       |  9 ++++----
 src/test/test_microdesc.c |  2 +-
 9 files changed, 63 insertions(+), 63 deletions(-)