[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

commit c1b36488e9c318fc414220e8549624b423560ad2 Merge: b117a06 3781955 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 3 09:39:19 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/bug15515 | 4 ++++ src/or/or.h | 3 +++ src/or/rendmid.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+)