commit bb68c731b897a967a4b7eb138728fa077617646e Merge: 374611d fcac4b4 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 8 10:09:17 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.5'

changes/bug11200-caching | 7 +++++++ src/or/directory.c | 2 +- src/or/nodelist.c | 21 ++++++++++++--------- src/or/routerlist.c | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-)