commit 53a605ee001f54c80352e92e1c714ab9b8a08bab Merge: cfb61f9 3781955 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 3 09:52:15 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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