[tor-commits] [tor/master] Merge branch 'bug15604_squashed'

[nickm at torproject.org]

commit 202bbfbaa4768ca34dbdff4931506823aa23f626
Merge: edde1a7 fda2aa7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 7 15:15:54 2015 -0400

    Merge branch 'bug15604_squashed'

 changes/bug15604 |    7 +++++++
 src/or/config.c  |    1 +
 2 files changed, 8 insertions(+)