[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

nickm at torproject.org nickm at torproject.org
Wed Jun 28 17:54:56 UTC 2017


commit 723f0487e9bf19a70f50aae6a3f570a4dfa9bb06
Merge: 48ff8bb e84127d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 28 13:49:28 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21969    |  3 +++
 src/or/bridges.c    |  6 +++++-
 src/or/directory.c  |  6 ++++--
 src/or/directory.h  |  4 +++-
 src/or/entrynodes.c | 28 ++++++++++++++++++++++++++++
 src/or/entrynodes.h |  4 ++++
 src/or/router.c     |  3 ++-
 src/or/routerlist.c |  2 +-
 8 files changed, 50 insertions(+), 6 deletions(-)





More information about the tor-commits mailing list