[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
nickm at torproject.org
nickm at torproject.org
Thu Jun 13 00:56:10 UTC 2013
commit d7d65298982444d34a15ef0cb3e453ddd584619c
Merge: 000b4f5 75b7cc1
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Jun 12 20:55:53 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8639 | 5 +++++
src/or/control.c | 17 +++++++++++++++--
src/or/dnsserv.c | 15 +++++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
More information about the tor-commits
mailing list