commit a64d062c958eed643e3bb0802269af12f9eabcb7 Merge: 8c88c75 3bdc4e5 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 12 10:01:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug2077_share_delete | 7 +++++++ src/common/compat.c | 2 +- src/test/test_microdesc.c | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-)