[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5

[nickm@xxxxxxxxxxxxxx]

commit e3408248b9373e52114773555d73f71492e30129
Merge: 410ce4c 6830667
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 9 13:12:54 2015 -0400

    Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5

 changes/bug13988 |    3 +++
 src/or/rephist.c |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits