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

[nickm at torproject.org]

commit 1686f81ac25328382a46ffe569db1d371f6b6be2
Merge: 518b0b3 f2fb85f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 14 13:30:10 2015 -0500

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

 changes/bug14195    |    3 +++
 src/or/addressmap.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)