commit 36909674b45d05854b821b6ac5952126a2cd2ab3 Merge: 5e5d4c9 cdb528d Author: Nick Mathewson nickm@torproject.org Date: Tue May 17 12:15:53 2016 -0400

Merge remote-tracking branch 'teor/bug18963-remember-v2'

changes/bug18963 | 5 ++ src/or/directory.c | 6 ++- src/or/dirvote.c | 5 +- src/or/networkstatus.c | 34 ++++++++----- src/or/networkstatus.h | 5 +- src/or/router.c | 3 +- src/or/routerlist.c | 107 +++++++++++++++++++++++++++++++++++------ src/or/routerlist.h | 5 +- src/test/test_dir_handle_get.c | 14 +++--- 9 files changed, 142 insertions(+), 42 deletions(-)