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

commit 49dca8b1beae9c2dade2c3193fa7f77f5c15d869 Merge: 7c5a455 2b9d487 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 7 07:50:14 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14125 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)