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

commit 52fd384a465ba91762bc4f71d239ed1e5150f947 Merge: f41be5f 9c4a0ae Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 21 11:18:11 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' changes/bug17403 | 3 +++ src/or/routerkeys.c | 2 ++ 2 files changed, 5 insertions(+)