[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug8625_prod'

[nickm at torproject.org]

commit 06e82084d6829084a43453e2b810d45c4e794259
Merge: a7e3179 ab8679f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 12 12:44:06 2016 -0400

    Merge remote-tracking branch 'andrea/bug8625_prod'

 changes/bug8625        |  4 ++++
 src/or/main.c          | 14 --------------
 src/or/networkstatus.c |  3 +++
 src/or/routerlist.c    |  7 +++++++
 4 files changed, 14 insertions(+), 14 deletions(-)