commit a3de2dfde6a92c0fe7ca755aa7bc1aa046c463a8 Merge: b63bf09 fb523b5 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 28 14:32:19 2015 -0500 Merge branch 'bug11485_026_v2_squashed' changes/ticket11485 | 3 + src/or/connection.c | 194 +++++++++++++++++++++++++++++++--------------- src/or/connection.h | 7 ++ src/or/connection_edge.c | 36 +++++++-- src/or/rendservice.c | 170 +++++++++++++++++++++++++++++++++++++--- 5 files changed, 329 insertions(+), 81 deletions(-)