commit e732ec295db714d84cc419be69764b10a302b633 Merge: 59f4c41 1af67d7 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 10 08:36:53 2015 -0400
Merge commit 'origin/maint-0.2.6^'
changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)