commit 67c0ad54263be7fb742a8d499f97f5908f9ec970 Merge: 87f9c51 8139db3 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 1 16:23:34 2014 -0400

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

changes/bug12878 | 3 +++ 1 file changed, 3 insertions(+)