commit cb488f99730c795fddca6f841fa35ce5248ea3b2 Merge: 826daaf a2e72ac Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 20 15:59:08 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7982 | 3 +++ src/or/or.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)