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

[nickm at torproject.org]

commit b969ee9dad0c582bf470c189beba458293f342a8
Merge: ef89fd1 41058dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 29 16:45:10 2014 -0400

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

 changes/bug12948   |    8 ++++++++
 changes/bug12996   |    5 +++++
 changes/bug12997   |    3 +++
 src/or/config.c    |    3 ++-
 src/or/onion_tap.c |    5 +++--
 src/or/rendmid.c   |   11 +++++++++--
 6 files changed, 30 insertions(+), 5 deletions(-)