[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
nickm at torproject.org
nickm at torproject.org
Thu Jun 13 13:43:58 UTC 2013
commit 29498491432040168c5df7091097a7b8a9c9ad86
Merge: 8c69207 25dddf7
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jun 13 09:43:53 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8822 | 5 +++++
src/or/control.c | 6 ++----
src/or/dirserv.c | 2 +-
src/or/microdesc.c | 26 ++++++++++++++++++++++----
4 files changed, 30 insertions(+), 9 deletions(-)
More information about the tor-commits
mailing list