commit dd681babf7505b6cbcab7d3e76b6feebcc2accc3 Merge: 6b585fc b6be171 Author: Isis Lovecruft isis@torproject.org Date: Tue Jan 28 17:46:51 2014 +0000

Merge branch 'fix/mako-template-caching' into develop

lib/bridgedb/HTTPServer.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)