commit 3d19eb71d2621ae749e5bfd6134b0d2c2250f58f Merge: 6a08bcf 8596ccc Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 16 15:48:41 2015 -0400

Merge remote-tracking branch 'public/feature_16580'

src/or/main.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)