commit 5c820def993cad85d18e887af74087163d769f04 Merge: f4c0735 9ae321d Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 9 22:39:55 2015 -0800
Merge remote-tracking branch 'sysrqb/bug14802_025'
changes/bug14802 | 4 ++++ src/common/compat.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)