commit 51c2dd8f8954d52fbaef29d2afb44d5eda47f4da Merge: 127cb39 5e22cfe Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 29 01:23:14 2012 -0500

Merge branch 'bug7814_squash'

changes/bug7814 | 4 ++++ src/or/connection_edge.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-)