commit fe3cb4a337373130a399afade47d439114e25e2e Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 4 09:46:44 2017 -0400

fold 21825 into changelog --- ChangeLog | 6 ++++++ changes/bug21825 | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog index afa380b..5c0d677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,12 @@ Changes in version 0.3.0.5-rc - 2017-04-0? - Update geoip and geoip6 to the March 7 2017 Maxmind GeoLite2 Country database.

+ o Minor bugfix (compilation): + - Fix a warning when compiling hs_service.c. Previously, it had no + exported symbols when compiled for libor.a, resulting in a + compilation warning from clang. Fixes bug 21825; bugfix + on 0.3.0.1-alpha. + o Minor bugfixes (hidden services): - Make hidden services check for failed intro point connections, even when they have exceeded their intro point creation limit. diff --git a/changes/bug21825 b/changes/bug21825 deleted file mode 100644 index 8f14b32..0000000 --- a/changes/bug21825 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfix (compilation): - - Functions in hs_service.c was only compiled for unit test making the - created object (.o) contain no symbols in src/or/libor.a resulting in a - compilation warning from clang. We now expose those functions for the - unit tests. This will be changed in 0.3.2 release. Fixes bug 21825.; - bugfix on tor-0.3.0.1-alpha.