commit b897e386da9f7e13eed123c7576046e4b40d410c Merge: 85f9794 86105a4 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 19 09:41:36 2015 -0500

Merge branch 'bug12844_macros'

changes/bug12844_macros | 4 ++++ src/or/circuituse.c | 2 ++ src/or/config.c | 2 ++ src/or/connection_edge.c | 2 ++ src/or/rendclient.c | 7 ++++++- 5 files changed, 16 insertions(+), 1 deletion(-)