12 Mar
2015
12 Mar
'15
5:24 p.m.
commit eecd410984e3f1741dda877fe482e082a41db700 Merge: a00d07a 24c031b Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 12:27:25 2015 -0400
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
changes/bug15064 | 4 ++++ changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ src/or/connection_edge.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-)