From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Dec 2012 20:49:09 +0000 (-0500)
Subject: Merge branch 'ticket7570_7571'
X-Git-Tag: tor-0.2.4.7-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b9cc6774fe81e5bf68293308f713d19816ff6da;p=thirdparty%2Ftor.git

Merge branch 'ticket7570_7571'

Conflicts:
	src/or/routerlist.c
---

9b9cc6774fe81e5bf68293308f713d19816ff6da