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

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/networkstatus.c
Simple merge

diff --cc src/or/networkstatus.h
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/routerlist.c
Simple merge

diff --cc src/or/routerlist.h
Simple merge