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

[nickm at torproject.org]

commit c6ac752353e6b03b2cbf2822d8fe2c60dfb03746
Merge: dfebefe 184a2db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 23 11:00:02 2014 -0500

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

 changes/bug14013 |    6 ++++++
 1 file changed, 6 insertions(+)