commit 44b48a9b67f2b4900bed872158dd480f38c27c08 Merge: d461e70 01e4bc8 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 3 09:52:01 2015 -0400

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

changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)