[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4

[nickm at torproject.org]

commit 3bdc4e5feee7059344f61d8d7362c77fafc5c8a8
Merge: 4f4fc63 884a0e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 12 10:00:33 2013 -0400

    Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4

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