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

[nickm at torproject.org]

commit 616fd790ecacf933e6a624a14a8971d9ebf70d5c
Merge: a64d062 fff9386
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 12 13:01:14 2013 -0400

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

 changes/bug2077_share_delete |    7 -------
 src/common/compat.c          |    2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)