[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit 781b477bc8af868661450473cdebb5d70312fd61
Merge: 5434820 f551a05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 8 15:08:51 2014 -0400

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

 .gitignore |    2 ++
 1 file changed, 2 insertions(+)