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

[nickm at torproject.org]

commit 5de91d118ddc3b33bdbed33dbe7fee93f8790c46
Merge: cfd0ee5 802c063
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 23 11:23:00 2014 -0400

    Merge branch 'bug11965_v2'

 changes/bug11965 |    6 ++++++
 src/or/main.c    |    6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)