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

diff --cc configure.ac
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/router.c
index 4fcd4a5b894f4abbb9282be8d5c9493192bc6696,2cdbb0c8bb14a8500b83eafc8115a90aec348134..4fcd4a5b894f4abbb9282be8d5c9493192bc6696
mode 100755,100644..100644
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c