commit 43f187ec2e40517148c11f8eaa915ec2ae6d1ec4 Merge: edaea77 8bf2892 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 22 20:47:10 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)