commit 2b3822d2daf884b39f2405d3bb1d1eb073557a28 Merge: bdd0c77 00fafe9 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 22 14:35:14 2014 -0400

Merge branch 'master' of git-rw.torproject.org:/tor

ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ ReleaseNotes | 27 +++++++++++++++++++++++++++ 2 files changed, 78 insertions(+)