commit ff1f6c417c53d905f47f26ea6b0fa90888857a8c Merge: 5e5b82f 1af67d7 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 19:47:28 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)