[tor-commits] [tor/master] Merge branch 'unify_microrevision_users'

[nickm@xxxxxxxxxxxxxx]

commit 66074ad1e21cfe6c98a70b279ed690e357d1c41c
Merge: 537092cdb 5aee26ee4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 11 10:20:39 2018 -0400

    Merge branch 'unify_microrevision_users'

 src/app/config/config.c                 |  2 +-
 src/core/include.am                     |  6 ------
 src/{core/or => lib/log}/git_revision.c | 10 +++++++++-
 src/{core/or => lib/log}/git_revision.h |  2 +-
 src/lib/log/include.am                  |  9 +++++++--
 src/lib/log/log.c                       | 14 ++++----------
 6 files changed, 22 insertions(+), 21 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits