commit bafae045ba4a117e2685a925f8a3e21e68368ed4 Merge: 3899cde 9f38cd9 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 17 23:06:34 2014 +0000

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug10929 | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)