commit 945aa9931112c02f5e50594915509b471897684c
Merge: 2b8ba55 0d6f293
Author: Nick Mathewson <[email protected]>
Date: Thu May 19 15:56:45 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.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 +-
8 files changed, 58 insertions(+), 60 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
