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

[nickm at torproject.org]

commit 8f48e1d686415c89688ecfb0ec9fe3e0e554ca3f
Merge: 2a965b7 c76059e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 9 10:31:14 2015 -0500

    Merge branch 'bug17776'

 changes/bug17776               |    6 +++++
 src/or/rendcache.c             |    6 ++---
 src/or/routerlist.c            |    8 +++---
 src/test/test_dir_handle_get.c |   21 ++++++++++-----
 src/test/test_rendcache.c      |   55 +++++++++++++++++++++++-----------------
 5 files changed, 60 insertions(+), 36 deletions(-)