commit 1799c2be09e7fabc1ff7cb98f0dcf73947c85319 Merge: 9092810 a883517 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 5 22:53:15 2015 -0500

Merge remote-tracking branch 'public/bug13796'

src/or/connection_edge.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)