commit 0dde4d6fa265b3f861900447c2cdcf23335072cf
Merge: cc6fd98 cbd2615
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Feb 25 08:56:34 2015 -0500
Merge remote-tracking branch 'yawning/bug14922'
src/common/util.c | 10 ----------
src/common/util.h | 1 -
src/or/rendservice.c | 4 ++--
src/test/test_util.c | 21 ---------------------
4 files changed, 2 insertions(+), 34 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
