Commit f64a88e7 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'tor-gitlab/mr/490'

parents a91bdca1 2905e766

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"]) 
AM_PROG_CC_C_O



dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some

dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and

dnl compilers if you want C99 support. Starting with 2.70, it is obsolete and

dnl forbidden.

m4_version_prereq([2.70], [:], [AC_PROG_CC_C99])

scripts/maint/format_changelog.py

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ def bug_html(m): 
    try:

        disp_prefix, url_prefix = ISSUE_PREFIX_MAP[prefix]

    except KeyError:

        print("Can't figure out URL for {}{}".formt(prefix,bugno),

        print("Can't figure out URL for {}{}".format(prefix,bugno),

              file=sys.stderr)

        return "{} {}{}".format(kind, prefix, bugno)

src/core/or/congestion_control_common.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ congestion_control_new(const circuit_params_t *params, cc_path_t path) 
}



/**

 * Free a congestion control object and its asssociated state.

 * Free a congestion control object and its associated state.

 */

void

congestion_control_free_(congestion_control_t *cc)

src/core/or/congestion_control_flow.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ circuit_send_stream_xon(edge_connection_t *stream) 
 * Process a stream XOFF, parsing it, and then stopping reading on

 * the edge connection.

 *

 * Record that we have recieved an xoff, so we know not to resume

 * Record that we have received an xoff, so we know not to resume

 * reading on this edge conn until we get an XON.

 *

 * Returns false if the XOFF did not validate; true if it does.

src/core/or/congestion_control_nola.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ congestion_control_nola_set_params(congestion_control_t *cc) 
*

* To handle the case where the local orconn blocks, TOR_NOLA uses

* the 'piecewise' BDP estimate, which uses more a conservative BDP

* estimate method when blocking occurrs, but a more aggressive BDP

* estimate method when blocking occurs, but a more aggressive BDP

* estimate when there is no local blocking. This minimizes local

* client queues.

*/