commit 3781955f079f25f8d6aa47cb746e339497076050 Merge: 9063f29 01e4bc8 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 3 09:38:54 2015 -0400

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

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