commit da04fed865b6df09b33e6b632d51d34b3eb20d14
Merge: 69f7f9b 7dce409
Author: Nick Mathewson <[email protected]>
Date: Tue Aug 11 09:34:55 2015 -0400
Merge branch 'bug16389_027_03_squashed'
src/common/container.h | 2 +-
src/or/main.c | 4 +
src/or/rendcache.c | 302 +++++++++++++++++++++++++++++++++++++++++++++++-
src/or/rendcache.h | 23 ++++
src/or/rendclient.c | 7 ++
src/or/rendclient.h | 4 -
src/or/rendcommon.h | 6 +
7 files changed, 340 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
