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

[nickm@xxxxxxxxxxxxxx]

commit 641cdc345c7a0e8123cee9a7b3864b63ba389afa
Merge: 2da2718 03fc4cf
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu May 5 08:25:27 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18929     |  5 ++++
 changes/feature18483 |  4 ++++
 src/or/directory.c   | 67 ++++++++++++++++++++++++++++++++++++++++++++--------
 src/or/directory.h   |  6 +++--
 src/or/or.h          |  2 +-
 src/or/routerlist.c  | 40 ++++++++++++++-----------------
 6 files changed, 89 insertions(+), 35 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits