[tor-commits] [tor/master] Merge branch 'bug28591_035_squashed'

[nickm@xxxxxxxxxxxxxx]

commit 3df1d29d9b5ccb3b49760105ca7fd434e22d3924
Merge: e6a440120 44db455cc
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 9 09:33:31 2019 -0500

    Merge branch 'bug28591_035_squashed'

 changes/bug28591                     |  4 ++
 changes/bug28654                     |  3 ++
 src/core/mainloop/mainloop.c         |  8 ++--
 src/feature/dircache/dircache.c      | 73 +++++++++++++++++++++++++-----------
 src/feature/nodelist/microdesc.c     | 10 +++--
 src/feature/nodelist/networkstatus.c | 35 +++++++++++------
 src/feature/nodelist/networkstatus.h |  2 +
 src/test/test_entrynodes.c           | 32 +++++++++++-----
 src/test/test_routerlist.c           |  1 -
 9 files changed, 115 insertions(+), 53 deletions(-)

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